7400 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/LICENSE b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/LICENSE
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/NOTICE b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/NOTICE
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/README b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/README
index 3ec27ef65f..3ec27ef65f 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/README
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/README
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/alert-aggregator.png b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/alert-aggregator.png
index ae429cca94..ae429cca94 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/alert-aggregator.png
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/alert-aggregator.png
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/alert-aggregator.svg b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/alert-aggregator.svg
index 807416135e..807416135e 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/alert-aggregator.svg
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/alert-aggregator.svg
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/build-dojo.xml b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/build-dojo.xml
index c31c9adee8..c31c9adee8 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/build-dojo.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/build-dojo.xml
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/build.xml b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/build.xml
index b75842d08c..b75842d08c 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/build.xml
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/pom.xml
index cf7cc915d4..cf7cc915d4 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/pom.xml
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java
index 808374030c..808374030c 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java
index e070e0b8f1..e070e0b8f1 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java
index c4bf13ce7a..c4bf13ce7a 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java
index 28e27a9978..28e27a9978 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java
index 7b943b1b45..7b943b1b45 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java
index ca2fc95b4a..ca2fc95b4a 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java
index 2962defb25..2962defb25 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java
index 75544294ce..75544294ce 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java
index 2a5775e9a9..2a5775e9a9 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java
index 549abbf602..549abbf602 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java
index 10575bf0dc..10575bf0dc 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl
index 8b376240c8..8b376240c8 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/Alerts.xsd b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/Alerts.xsd
index f0ec561ad8..f0ec561ad8 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/Alerts.xsd
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/Alerts.xsd
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl
index d5642a32d1..d5642a32d1 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/alerts-client.composite b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/alerts-client.composite
index 49f44f9da8..49f44f9da8 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/alerts-client.composite
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/alerts-client.composite
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/alerts.composite b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/alerts.composite
index c359b275be..c359b275be 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/alerts.composite
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/alerts.composite
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/sources.xml b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/sources.xml
index e45250eddb..e45250eddb 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/sources.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/resources/sources.xml
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/AlertAggregator.html b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/AlertAggregator.html
index 8b472fd0fa..8b472fd0fa 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/AlertAggregator.html
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/AlertAggregator.html
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 0bc67c4c98..0bc67c4c98 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 8e1e3933b5..8e1e3933b5 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
index a81165e1b4..a81165e1b4 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/pop.png b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/pop.png
index 1cf1df24a7..1cf1df24a7 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/pop.png
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/pop.png
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/rss.png b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/rss.png
index b3c949d224..b3c949d224 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/rss.png
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/rss.png
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/service.smd b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/service.smd
index 3c6b6c9b12..3c6b6c9b12 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/service.smd
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/service.smd
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/sources.smd b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/sources.smd
index b5f1824363..b5f1824363 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/sources.smd
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/sources.smd
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/style.css b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/style.css
index f5bbf23379..f5bbf23379 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/style.css
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/main/webapp/style.css
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
index f0cb9ecfcb..f0cb9ecfcb 100644
--- a/branches/sca-equinox/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
diff --git a/branches/sca-equinox/demos/bigbank-account/LICENSE b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/demos/bigbank-account/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/LICENSE
diff --git a/branches/sca-equinox/demos/bigbank-account/NOTICE b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/demos/bigbank-account/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/NOTICE
diff --git a/branches/sca-equinox/demos/bigbank-account/README b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/README
index 5c0d850c5e..5c0d850c5e 100644
--- a/branches/sca-equinox/demos/bigbank-account/README
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/README
diff --git a/branches/sca-equinox/demos/bigbank-account/bigbank.png b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/bigbank.png
index 985cc6bd05..985cc6bd05 100644
--- a/branches/sca-equinox/demos/bigbank-account/bigbank.png
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/bigbank.png
diff --git a/branches/sca-equinox/demos/bigbank-account/bigbank.svg b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/bigbank.svg
index 0650075d48..0650075d48 100644
--- a/branches/sca-equinox/demos/bigbank-account/bigbank.svg
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/bigbank.svg
diff --git a/branches/sca-equinox/demos/bigbank-account/build-dojo.xml b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/build-dojo.xml
index 0e029c6335..0e029c6335 100644
--- a/branches/sca-equinox/demos/bigbank-account/build-dojo.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/build-dojo.xml
diff --git a/branches/sca-equinox/demos/bigbank-account/build.xml b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/build.xml
index 67237cc02a..67237cc02a 100644
--- a/branches/sca-equinox/demos/bigbank-account/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/build.xml
diff --git a/branches/sca-equinox/demos/bigbank-account/pom.xml b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/pom.xml
index c44f7f0e9c..c44f7f0e9c 100644
--- a/branches/sca-equinox/demos/bigbank-account/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/pom.xml
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountDetails.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
index 57c1adcba0..57c1adcba0 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java
index bf919525c4..bf919525c4 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
index 0ed4b1dd2e..0ed4b1dd2e 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountDetails.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
index cc9023da60..cc9023da60 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java
index 5bf6e6d26b..5bf6e6d26b 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
index 1f4f02ea6d..1f4f02ea6d 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
index 579b4ee64b..579b4ee64b 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
index 5c64e11d10..5c64e11d10 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
index c98dcacbf3..c98dcacbf3 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
index 121ee9a3f8..121ee9a3f8 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
index c8b73d4ed4..c8b73d4ed4 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
index 5fecef691e..5fecef691e 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
index 419b5def58..419b5def58 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
index a0e53606e3..a0e53606e3 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountDetails.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountDetails.java
index 1473436000..1473436000 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountDetails.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountDetails.java
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java
index fcbf8a4831..fcbf8a4831 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
index 28101a1986..28101a1986 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/resources/CheckingsAccount.composite b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/resources/CheckingsAccount.composite
index cc76e30a75..cc76e30a75 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/resources/CheckingsAccount.composite
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/resources/CheckingsAccount.composite
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml
index c5532b879d..c5532b879d 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 6491a0d326..6491a0d326 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index b1bce4339d..b1bce4339d 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index d6bfe2167e..d6bfe2167e 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/resources/SavingsAccount.composite b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/resources/SavingsAccount.composite
index 696b96d6e6..696b96d6e6 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/resources/SavingsAccount.composite
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/resources/SavingsAccount.composite
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/resources/StockAccount.composite b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/resources/StockAccount.composite
index 62c0b63003..62c0b63003 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/resources/StockAccount.composite
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/resources/StockAccount.composite
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/resources/definitions.xml
index 31a8798f8b..31a8798f8b 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/resources/web/AccountJSON.html b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/resources/web/AccountJSON.html
index 1609bf4b43..1609bf4b43 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/resources/web/AccountJSON.html
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/resources/web/AccountJSON.html
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/resources/web/style.css b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/resources/web/style.css
index 1071583264..1071583264 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/resources/web/style.css
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/resources/web/style.css
diff --git a/branches/sca-equinox/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl
index ac4d987a57..ac4d987a57 100644
--- a/branches/sca-equinox/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-equinox/demos/bigbank-calculator/LICENSE b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/demos/bigbank-calculator/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/LICENSE
diff --git a/branches/sca-equinox/demos/bigbank-calculator/NOTICE b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/demos/bigbank-calculator/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/NOTICE
diff --git a/branches/sca-equinox/demos/bigbank-calculator/README b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/README
index e8ff28fc0f..e8ff28fc0f 100644
--- a/branches/sca-equinox/demos/bigbank-calculator/README
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/README
diff --git a/branches/sca-equinox/demos/bigbank-calculator/build.xml b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/build.xml
index ee494e1d87..ee494e1d87 100644
--- a/branches/sca-equinox/demos/bigbank-calculator/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/build.xml
diff --git a/branches/sca-equinox/demos/bigbank-calculator/pom.xml b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/pom.xml
index e67143c1d5..e67143c1d5 100644
--- a/branches/sca-equinox/demos/bigbank-calculator/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/pom.xml
diff --git a/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/AddService.java
index 4eeb30a9c2..4eeb30a9c2 100644
--- a/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index ed7bee0f4e..ed7bee0f4e 100644
--- a/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/DivideService.java
index 131c5a8014..131c5a8014 100644
--- a/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java
index a917896aeb..a917896aeb 100644
--- a/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java
index e328f024ea..e328f024ea 100644
--- a/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java
index b1861daafc..b1861daafc 100644
--- a/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java
diff --git a/branches/sca-equinox/demos/bigbank-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/resources/Calculator.composite
index fbf2203fae..fbf2203fae 100644
--- a/branches/sca-equinox/demos/bigbank-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
index 1d4d221364..1d4d221364 100644
--- a/branches/sca-equinox/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
diff --git a/branches/sca-equinox/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/branches/sca-equinox/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/branches/sca-equinox/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
index dd56af0ad8..dd56af0ad8 100644
--- a/branches/sca-equinox/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/branches/sca-equinox/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
index 08fa310f46..08fa310f46 100644
--- a/branches/sca-equinox/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/branches/sca-equinox/demos/bigbank-stockquote/LICENSE b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/demos/bigbank-stockquote/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/LICENSE
diff --git a/branches/sca-equinox/demos/bigbank-stockquote/NOTICE b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/demos/bigbank-stockquote/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/NOTICE
diff --git a/branches/sca-equinox/demos/bigbank-stockquote/README b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/README
index 2ea98d020c..2ea98d020c 100644
--- a/branches/sca-equinox/demos/bigbank-stockquote/README
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/README
diff --git a/branches/sca-equinox/demos/bigbank-stockquote/build.xml b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/build.xml
index 145c158ac2..145c158ac2 100644
--- a/branches/sca-equinox/demos/bigbank-stockquote/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/build.xml
diff --git a/branches/sca-equinox/demos/bigbank-stockquote/pom.xml b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/pom.xml
index a749be2c36..a749be2c36 100644
--- a/branches/sca-equinox/demos/bigbank-stockquote/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/pom.xml
diff --git a/branches/sca-equinox/demos/bigbank-stockquote/src/main/java/stockquote/PasswordCallbackHandler.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/src/main/java/stockquote/PasswordCallbackHandler.java
index 2d7821171d..2d7821171d 100644
--- a/branches/sca-equinox/demos/bigbank-stockquote/src/main/java/stockquote/PasswordCallbackHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/src/main/java/stockquote/PasswordCallbackHandler.java
diff --git a/branches/sca-equinox/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java
index 2a0801f9b8..2a0801f9b8 100644
--- a/branches/sca-equinox/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java
diff --git a/branches/sca-equinox/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java
index 9d128657eb..9d128657eb 100644
--- a/branches/sca-equinox/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java
diff --git a/branches/sca-equinox/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java
index 04ed762602..04ed762602 100644
--- a/branches/sca-equinox/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java
diff --git a/branches/sca-equinox/demos/bigbank-stockquote/src/main/resources/StockQuote.composite b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/src/main/resources/StockQuote.composite
index aaad92c861..aaad92c861 100644
--- a/branches/sca-equinox/demos/bigbank-stockquote/src/main/resources/StockQuote.composite
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/src/main/resources/StockQuote.composite
diff --git a/branches/sca-equinox/demos/bigbank-stockquote/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/src/main/resources/definitions.xml
index 7e1f51304e..7e1f51304e 100644
--- a/branches/sca-equinox/demos/bigbank-stockquote/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/demos/bigbank-stockquote/src/main/resources/security.properties b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/src/main/resources/security.properties
index 0063207e06..0063207e06 100644
--- a/branches/sca-equinox/demos/bigbank-stockquote/src/main/resources/security.properties
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/src/main/resources/security.properties
diff --git a/branches/sca-equinox/demos/bigbank-stockquote/src/main/resources/stockQuote.jks b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/src/main/resources/stockQuote.jks
index d53d32c4ef..d53d32c4ef 100644
--- a/branches/sca-equinox/demos/bigbank-stockquote/src/main/resources/stockQuote.jks
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank-stockquote/src/main/resources/stockQuote.jks
diff --git a/branches/sca-equinox/demos/bigbank/LICENSE b/sca-java-2.x/branches/sca-equinox/demos/bigbank/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/demos/bigbank/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/LICENSE
diff --git a/branches/sca-equinox/demos/bigbank/NOTICE b/sca-java-2.x/branches/sca-equinox/demos/bigbank/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/demos/bigbank/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/NOTICE
diff --git a/branches/sca-equinox/demos/bigbank/README b/sca-java-2.x/branches/sca-equinox/demos/bigbank/README
index 5ec796db60..5ec796db60 100644
--- a/branches/sca-equinox/demos/bigbank/README
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/README
diff --git a/branches/sca-equinox/demos/bigbank/bigbank.png b/sca-java-2.x/branches/sca-equinox/demos/bigbank/bigbank.png
index 985cc6bd05..985cc6bd05 100644
--- a/branches/sca-equinox/demos/bigbank/bigbank.png
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/bigbank.png
diff --git a/branches/sca-equinox/demos/bigbank/bigbank.svg b/sca-java-2.x/branches/sca-equinox/demos/bigbank/bigbank.svg
index 30aa0eab6d..30aa0eab6d 100644
--- a/branches/sca-equinox/demos/bigbank/bigbank.svg
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/bigbank.svg
diff --git a/branches/sca-equinox/demos/bigbank/build-dojo.xml b/sca-java-2.x/branches/sca-equinox/demos/bigbank/build-dojo.xml
index 9d282c2dd2..9d282c2dd2 100644
--- a/branches/sca-equinox/demos/bigbank/build-dojo.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/build-dojo.xml
diff --git a/branches/sca-equinox/demos/bigbank/build.xml b/sca-java-2.x/branches/sca-equinox/demos/bigbank/build.xml
index 046aadd228..046aadd228 100644
--- a/branches/sca-equinox/demos/bigbank/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/build.xml
diff --git a/branches/sca-equinox/demos/bigbank/pom.xml b/sca-java-2.x/branches/sca-equinox/demos/bigbank/pom.xml
index e4d2afbc89..e4d2afbc89 100644
--- a/branches/sca-equinox/demos/bigbank/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/pom.xml
diff --git a/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/account/AccountService.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/account/AccountService.java
index 2cb8027874..2cb8027874 100644
--- a/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/account/AccountService.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/account/AccountService.java
diff --git a/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
index 4f0e3879dc..4f0e3879dc 100644
--- a/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java
index 13d79a9c33..13d79a9c33 100644
--- a/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java
diff --git a/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/client/BigBankClient.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/client/BigBankClient.java
index a7fa5ecc22..a7fa5ecc22 100644
--- a/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/client/BigBankClient.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/client/BigBankClient.java
diff --git a/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/demo/BigBankServer.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/demo/BigBankServer.java
index 05360e07a5..05360e07a5 100644
--- a/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/demo/BigBankServer.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/demo/BigBankServer.java
diff --git a/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/security/BigbankPasswordCallbackHandler.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/security/BigbankPasswordCallbackHandler.java
index 6d3b547939..6d3b547939 100644
--- a/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/security/BigbankPasswordCallbackHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/java/bigbank/security/BigbankPasswordCallbackHandler.java
diff --git a/branches/sca-equinox/demos/bigbank/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-equinox/demos/bigbank/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/demos/bigbank/src/main/java/stockquote/StockQuoteService.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/java/stockquote/StockQuoteService.java
index 749b8ee2f4..749b8ee2f4 100644
--- a/branches/sca-equinox/demos/bigbank/src/main/java/stockquote/StockQuoteService.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/java/stockquote/StockQuoteService.java
diff --git a/branches/sca-equinox/demos/bigbank/src/main/resources/BigBank.composite b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/resources/BigBank.composite
index 9c1a575573..9c1a575573 100644
--- a/branches/sca-equinox/demos/bigbank/src/main/resources/BigBank.composite
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/resources/BigBank.composite
diff --git a/branches/sca-equinox/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml
index 154992c843..154992c843 100644
--- a/branches/sca-equinox/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/demos/bigbank/src/main/resources/bigbank.jks b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/resources/bigbank.jks
index e6294d85f7..e6294d85f7 100644
--- a/branches/sca-equinox/demos/bigbank/src/main/resources/bigbank.jks
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/resources/bigbank.jks
diff --git a/branches/sca-equinox/demos/bigbank/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/resources/definitions.xml
index 8654151d82..8654151d82 100644
--- a/branches/sca-equinox/demos/bigbank/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/demos/bigbank/src/main/resources/security.properties b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/resources/security.properties
index 762d0523d9..762d0523d9 100644
--- a/branches/sca-equinox/demos/bigbank/src/main/resources/security.properties
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/resources/security.properties
diff --git a/branches/sca-equinox/demos/bigbank/src/main/resources/web/AccountJSON.html b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/resources/web/AccountJSON.html
index 9f4368443f..9f4368443f 100644
--- a/branches/sca-equinox/demos/bigbank/src/main/resources/web/AccountJSON.html
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/resources/web/AccountJSON.html
diff --git a/branches/sca-equinox/demos/bigbank/src/main/resources/web/style.css b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/resources/web/style.css
index 1071583264..1071583264 100644
--- a/branches/sca-equinox/demos/bigbank/src/main/resources/web/style.css
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/resources/web/style.css
diff --git a/branches/sca-equinox/demos/bigbank/src/main/resources/wsdl/AccountService.wsdl b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/resources/wsdl/AccountService.wsdl
index ac4d987a57..ac4d987a57 100644
--- a/branches/sca-equinox/demos/bigbank/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-equinox/demos/bigbank/src/test/java/test/BigBankTestCase.java b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/test/java/test/BigBankTestCase.java
index 3b7c5ef2ad..3b7c5ef2ad 100644
--- a/branches/sca-equinox/demos/bigbank/src/test/java/test/BigBankTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/bigbank/src/test/java/test/BigBankTestCase.java
diff --git a/branches/sca-equinox/demos/load-balancing-webapp/LICENSE b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/demos/load-balancing-webapp/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/LICENSE
diff --git a/branches/sca-equinox/demos/load-balancing-webapp/NOTICE b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/demos/load-balancing-webapp/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/NOTICE
diff --git a/branches/sca-equinox/demos/load-balancing-webapp/README b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/README
index b7bbb64b1a..b7bbb64b1a 100644
--- a/branches/sca-equinox/demos/load-balancing-webapp/README
+++ b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/README
diff --git a/branches/sca-equinox/demos/load-balancing-webapp/build-tomcat.xml b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/build-tomcat.xml
index 7e1dc4b0e9..7e1dc4b0e9 100644
--- a/branches/sca-equinox/demos/load-balancing-webapp/build-tomcat.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/build-tomcat.xml
diff --git a/branches/sca-equinox/demos/load-balancing-webapp/build.xml b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/build.xml
index 4ec1f30b6c..4ec1f30b6c 100644
--- a/branches/sca-equinox/demos/load-balancing-webapp/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/build.xml
diff --git a/branches/sca-equinox/demos/load-balancing-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/pom.xml
index d0b807ba53..d0b807ba53 100644
--- a/branches/sca-equinox/demos/load-balancing-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/pom.xml
diff --git a/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java
index efa89b4fe9..efa89b4fe9 100644
--- a/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java
diff --git a/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/domain/LaunchDomain.java b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/domain/LaunchDomain.java
index 33c37869a3..33c37869a3 100644
--- a/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/domain/LaunchDomain.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/domain/LaunchDomain.java
diff --git a/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java
index 65dc030d89..65dc030d89 100644
--- a/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldService.java
index 7245513b2a..7245513b2a 100644
--- a/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldServiceClient.java b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldServiceClient.java
index f3d2fdb2ed..f3d2fdb2ed 100644
--- a/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldServiceClient.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldServiceClient.java
diff --git a/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/org/apache/tuscany/sca/demos/loadbalancer/rule/RoundRobinRule.java b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/org/apache/tuscany/sca/demos/loadbalancer/rule/RoundRobinRule.java
index 5dc1b6671b..5dc1b6671b 100644
--- a/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/org/apache/tuscany/sca/demos/loadbalancer/rule/RoundRobinRule.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/main/java/org/apache/tuscany/sca/demos/loadbalancer/rule/RoundRobinRule.java
diff --git a/branches/sca-equinox/demos/load-balancing-webapp/src/main/resources/client-contribution/helloworldwsclient.composite b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/main/resources/client-contribution/helloworldwsclient.composite
index 9b6052741e..9b6052741e 100644
--- a/branches/sca-equinox/demos/load-balancing-webapp/src/main/resources/client-contribution/helloworldwsclient.composite
+++ b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/main/resources/client-contribution/helloworldwsclient.composite
diff --git a/branches/sca-equinox/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 11347004f9..11347004f9 100644
--- a/branches/sca-equinox/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
index 1ab78d802d..1ab78d802d 100644
--- a/branches/sca-equinox/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
+++ b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
diff --git a/branches/sca-equinox/demos/load-balancing-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/main/webapp/WEB-INF/web.xml
index 8d47ae2207..8d47ae2207 100644
--- a/branches/sca-equinox/demos/load-balancing-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/apache-80/conf/httpd.conf b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/apache-80/conf/httpd.conf
index 37cf284d35..37cf284d35 100644
--- a/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/apache-80/conf/httpd.conf
+++ b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/apache-80/conf/httpd.conf
diff --git a/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/apache-80/conf/workers.properties b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/apache-80/conf/workers.properties
index 9228c4fd8e..9228c4fd8e 100644
--- a/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/apache-80/conf/workers.properties
+++ b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/apache-80/conf/workers.properties
diff --git a/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/tomcat-8085/conf/server.xml b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/tomcat-8085/conf/server.xml
index 920fa7b037..920fa7b037 100644
--- a/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/tomcat-8085/conf/server.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/tomcat-8085/conf/server.xml
diff --git a/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/tomcat-8085/webapps/balancer/WEB-INF/config/rules.xml b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/tomcat-8085/webapps/balancer/WEB-INF/config/rules.xml
index 7486dc8148..7486dc8148 100644
--- a/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/tomcat-8085/webapps/balancer/WEB-INF/config/rules.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/tomcat-8085/webapps/balancer/WEB-INF/config/rules.xml
diff --git a/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/tomcat-8086/conf/server.xml b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/tomcat-8086/conf/server.xml
index 5ecb8fe5c4..5ecb8fe5c4 100644
--- a/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/tomcat-8086/conf/server.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/tomcat-8086/conf/server.xml
diff --git a/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/tomcat-8087/conf/server.xml b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/tomcat-8087/conf/server.xml
index f83c68191c..f83c68191c 100644
--- a/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/tomcat-8087/conf/server.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/load-balancing-webapp/src/test/resources/tomcat-8087/conf/server.xml
diff --git a/branches/sca-equinox/demos/mortgage-creditcheck/LICENSE b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/demos/mortgage-creditcheck/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/LICENSE
diff --git a/branches/sca-equinox/demos/mortgage-creditcheck/NOTICE b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/demos/mortgage-creditcheck/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/NOTICE
diff --git a/branches/sca-equinox/demos/mortgage-creditcheck/README b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/README
index b785802920..b785802920 100644
--- a/branches/sca-equinox/demos/mortgage-creditcheck/README
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/README
diff --git a/branches/sca-equinox/demos/mortgage-creditcheck/build.xml b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/build.xml
index 59f1342276..59f1342276 100644
--- a/branches/sca-equinox/demos/mortgage-creditcheck/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/build.xml
diff --git a/branches/sca-equinox/demos/mortgage-creditcheck/pom.xml b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/pom.xml
index 2429940275..2429940275 100644
--- a/branches/sca-equinox/demos/mortgage-creditcheck/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/pom.xml
diff --git a/branches/sca-equinox/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java
index ec95a60227..ec95a60227 100644
--- a/branches/sca-equinox/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java
diff --git a/branches/sca-equinox/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java
index f19e8a1250..f19e8a1250 100644
--- a/branches/sca-equinox/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java
diff --git a/branches/sca-equinox/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java
index 870ea1941d..870ea1941d 100644
--- a/branches/sca-equinox/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java
diff --git a/branches/sca-equinox/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite
index 5c828f5a39..5c828f5a39 100644
--- a/branches/sca-equinox/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite
diff --git a/branches/sca-equinox/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl
index 9c2acc96d3..9c2acc96d3 100644
--- a/branches/sca-equinox/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl
diff --git a/branches/sca-equinox/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml
index aea009292a..aea009292a 100644
--- a/branches/sca-equinox/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml
index d7b2e32dd1..d7b2e32dd1 100644
--- a/branches/sca-equinox/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/LICENSE b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/LICENSE
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/NOTICE b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/NOTICE
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/README b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/README
index dbf3829a20..dbf3829a20 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/README
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/README
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/build.xml b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/build.xml
index 9a0a83bf1d..9a0a83bf1d 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/build.xml
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/doc/credit_composite.jpg b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/credit_composite.jpg
index e28ed63cfb..e28ed63cfb 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/doc/credit_composite.jpg
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/credit_composite.jpg
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/doc/credit_composite.png b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/credit_composite.png
index 0bfce0078d..0bfce0078d 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/doc/credit_composite.png
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/credit_composite.png
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/doc/loan_approval.jpg b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/loan_approval.jpg
index 3f00557c7f..3f00557c7f 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/doc/loan_approval.jpg
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/loan_approval.jpg
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/doc/loan_approval.png b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/loan_approval.png
index 9d5f829fe5..9d5f829fe5 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/doc/loan_approval.png
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/loan_approval.png
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly0.jpg b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly0.jpg
index 515b6ecde7..515b6ecde7 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly0.jpg
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly0.jpg
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly0.png b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly0.png
index 4b815a4b82..4b815a4b82 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly0.png
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly0.png
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly1.jpg b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly1.jpg
index 01a7c55a14..01a7c55a14 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly1.jpg
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly1.jpg
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly1.png b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly1.png
index 07422c4f45..07422c4f45 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly1.png
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly1.png
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly2.jpg b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly2.jpg
index 992c048684..992c048684 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly2.jpg
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly2.jpg
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly2.png b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly2.png
index 4667956ed0..4667956ed0 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly2.png
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_assembly2.png
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_composite.jpg b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_composite.jpg
index 5021f6a317..5021f6a317 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_composite.jpg
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_composite.jpg
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_composite.png b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_composite.png
index 1398c50ded..1398c50ded 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_composite.png
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_composite.png
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_diagrams.doc b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_diagrams.doc
index 32a0b72907..32a0b72907 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_diagrams.doc
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_diagrams.doc
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_package1.jpg b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_package1.jpg
index e91c5f1bbd..e91c5f1bbd 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_package1.jpg
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_package1.jpg
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_package1.png b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_package1.png
index db304a4c28..db304a4c28 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_package1.png
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_package1.png
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_package2.jpg b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_package2.jpg
index e8c2865e4a..e8c2865e4a 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_package2.jpg
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_package2.jpg
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_package2.png b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_package2.png
index 502e538e94..502e538e94 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_package2.png
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_package2.png
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_scenario.jpg b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_scenario.jpg
index fccf2e35c3..fccf2e35c3 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_scenario.jpg
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_scenario.jpg
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_scenario.png b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_scenario.png
index b8f42ad318..b8f42ad318 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_scenario.png
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/doc/mortgage_scenario.png
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/mortgage_assembly.png b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/mortgage_assembly.png
index 4667956ed0..4667956ed0 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/mortgage_assembly.png
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/mortgage_assembly.png
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/pom.xml b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/pom.xml
index 963e7fef42..963e7fef42 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/pom.xml
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java
index c5787b7819..c5787b7819 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java
index dc803d9688..dc803d9688 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java
index 66a486d516..66a486d516 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java
index b5bafeb204..b5bafeb204 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java
index 8c642667f1..8c642667f1 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java
index dcdad18496..dcdad18496 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java
index 40bfdc4a1d..40bfdc4a1d 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java
index cacd8694de..cacd8694de 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java
index 015f1bae98..015f1bae98 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java
index d69f0a1163..d69f0a1163 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java
index 23c9589e85..23c9589e85 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java
index c2116366ec..c2116366ec 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite
index d1128b9907..d1128b9907 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite
index 4cad6c7223..4cad6c7223 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType
index bf7b10e0f7..bf7b10e0f7 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js
index b25af1d039..b25af1d039 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl
index 9c2acc96d3..9c2acc96d3 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl
diff --git a/branches/sca-equinox/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java
index 285cc72515..285cc72515 100644
--- a/branches/sca-equinox/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java
diff --git a/branches/sca-equinox/demos/pom.xml b/sca-java-2.x/branches/sca-equinox/demos/pom.xml
index d75e19e066..d75e19e066 100644
--- a/branches/sca-equinox/demos/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/pom.xml
diff --git a/branches/sca-equinox/demos/workpool-distributed/LICENSE b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/demos/workpool-distributed/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/LICENSE
diff --git a/branches/sca-equinox/demos/workpool-distributed/NOTICE b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-equinox/demos/workpool-distributed/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/NOTICE
diff --git a/branches/sca-equinox/demos/workpool-distributed/build.xml b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/build.xml
index 9e10e8ec91..9e10e8ec91 100644
--- a/branches/sca-equinox/demos/workpool-distributed/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/build.xml
diff --git a/branches/sca-equinox/demos/workpool-distributed/pom.xml b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/pom.xml
index 030812c7fa..030812c7fa 100644
--- a/branches/sca-equinox/demos/workpool-distributed/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/pom.xml
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/DomainNode.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/DomainNode.java
index a278499aae..a278499aae 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/DomainNode.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/DomainNode.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/DomainNodeDaemon.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/DomainNodeDaemon.java
index 9d05761ad6..9d05761ad6 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/DomainNodeDaemon.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/DomainNodeDaemon.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/TestJob.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/TestJob.java
index f48e647bd6..f48e647bd6 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/TestJob.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/TestJob.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/WorkpoolDaemon.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/WorkpoolDaemon.java
index 1f2a4d1f9a..1f2a4d1f9a 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/WorkpoolDaemon.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/WorkpoolDaemon.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/WorkpoolNode.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/WorkpoolNode.java
index 86557548af..86557548af 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/WorkpoolNode.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/WorkpoolNode.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/workerRules1.drl b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/workerRules1.drl
index 9c5a5d1b7f..9c5a5d1b7f 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/workerRules1.drl
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/node/workerRules1.drl
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/MetaComponentWorker.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/MetaComponentWorker.java
index cdd0f30b34..cdd0f30b34 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/MetaComponentWorker.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/MetaComponentWorker.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/MyWorker.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/MyWorker.java
index c45696e3cf..c45696e3cf 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/MyWorker.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/MyWorker.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/NullJob.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/NullJob.java
index fb930adf2e..fb930adf2e 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/NullJob.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/NullJob.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/ResultJob.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/ResultJob.java
index e04411668b..e04411668b 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/ResultJob.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/ResultJob.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/Trigger.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/Trigger.java
index 469675b19b..469675b19b 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/Trigger.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/Trigger.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkerManager.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkerManager.java
index 520203e190..520203e190 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkerManager.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkerManager.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkerManagerImpl.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkerManagerImpl.java
index d4337cad2f..d4337cad2f 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkerManagerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkerManagerImpl.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkerService.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkerService.java
index 37b7ea227a..37b7ea227a 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkerService.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkerService.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkerServiceCallback.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkerServiceCallback.java
index 6fb1278e5e..6fb1278e5e 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkerServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkerServiceCallback.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkerServiceImpl.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkerServiceImpl.java
index 2c9bf5ea48..2c9bf5ea48 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkerServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkerServiceImpl.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolBean.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolBean.java
index 80c093ff1c..80c093ff1c 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolBean.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolBean.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolBeanListener.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolBeanListener.java
index 0ecc223fed..0ecc223fed 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolBeanListener.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolBeanListener.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolEvent.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolEvent.java
index 0bdc3671d5..0bdc3671d5 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolEvent.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolEvent.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolManager.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolManager.java
index 6520954bdd..6520954bdd 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolManager.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolManager.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolManagerImpl.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolManagerImpl.java
index f7c727ad04..f7c727ad04 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolManagerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolManagerImpl.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolService.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolService.java
index d84ae549d8..d84ae549d8 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolService.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolService.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolServiceImpl.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolServiceImpl.java
index 52b88af42c..52b88af42c 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/java/workpool/WorkpoolServiceImpl.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
index b3e2d16c05..b3e2d16c05 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeA/Workpool.composite b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeA/Workpool.composite
index 9a00a8e839..9a00a8e839 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeA/Workpool.composite
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeA/Workpool.composite
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
index b3e2d16c05..b3e2d16c05 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeB/Workpool.composite b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeB/Workpool.composite
index a71dc9e08a..a71dc9e08a 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeB/Workpool.composite
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeB/Workpool.composite
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
index b3e2d16c05..b3e2d16c05 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeC/Workpool.composite b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeC/Workpool.composite
index 771db5370b..771db5370b 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeC/Workpool.composite
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeC/Workpool.composite
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeD/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeD/META-INF/sca-contribution.xml
index b3e2d16c05..b3e2d16c05 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeD/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeD/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeD/Workpool.composite b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeD/Workpool.composite
index 55fd48934f..55fd48934f 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeD/Workpool.composite
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeD/Workpool.composite
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeE/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeE/META-INF/sca-contribution.xml
index b3e2d16c05..b3e2d16c05 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeE/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeE/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeE/Workpool.composite b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeE/Workpool.composite
index 1dc9ccfcea..1dc9ccfcea 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeE/Workpool.composite
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/main/resources/nodeE/Workpool.composite
diff --git a/branches/sca-equinox/demos/workpool-distributed/src/test/java/workpool/AComponent.java b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/test/java/workpool/AComponent.java
index 5c20537fab..5c20537fab 100644
--- a/branches/sca-equinox/demos/workpool-distributed/src/test/java/workpool/AComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/src/test/java/workpool/AComponent.java
diff --git a/branches/sca-equinox/demos/workpool-distributed/workerRules.drl b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/workerRules.drl
index e7ebcad4c0..e7ebcad4c0 100644
--- a/branches/sca-equinox/demos/workpool-distributed/workerRules.drl
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/workerRules.drl
diff --git a/branches/sca-equinox/demos/workpool-distributed/workerRules1.drl b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/workerRules1.drl
index 6fa0b85ba2..6fa0b85ba2 100644
--- a/branches/sca-equinox/demos/workpool-distributed/workerRules1.drl
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/workerRules1.drl
diff --git a/branches/sca-equinox/demos/workpool-distributed/workerRules2.drl b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/workerRules2.drl
index 9d9551c3ea..9d9551c3ea 100644
--- a/branches/sca-equinox/demos/workpool-distributed/workerRules2.drl
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/workerRules2.drl
diff --git a/branches/sca-equinox/demos/workpool-distributed/workerRules3.drl b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/workerRules3.drl
index a67af910a4..a67af910a4 100644
--- a/branches/sca-equinox/demos/workpool-distributed/workerRules3.drl
+++ b/sca-java-2.x/branches/sca-equinox/demos/workpool-distributed/workerRules3.drl
diff --git a/branches/sca-equinox/demos/xml-bigbank/LICENSE b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/demos/xml-bigbank/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/LICENSE
diff --git a/branches/sca-equinox/demos/xml-bigbank/NOTICE b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/demos/xml-bigbank/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/NOTICE
diff --git a/branches/sca-equinox/demos/xml-bigbank/README b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/README
index 3bdeeca60a..3bdeeca60a 100644
--- a/branches/sca-equinox/demos/xml-bigbank/README
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/README
diff --git a/branches/sca-equinox/demos/xml-bigbank/build.xml b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/build.xml
index 0ba1b069aa..0ba1b069aa 100644
--- a/branches/sca-equinox/demos/xml-bigbank/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/build.xml
diff --git a/branches/sca-equinox/demos/xml-bigbank/pom.xml b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/pom.xml
index b3f703712a..b3f703712a 100644
--- a/branches/sca-equinox/demos/xml-bigbank/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/pom.xml
diff --git a/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/AccountData.java b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/AccountData.java
index c3ae8d0912..c3ae8d0912 100644
--- a/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/AccountData.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/AccountData.java
diff --git a/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java
index 1c0c612987..1c0c612987 100644
--- a/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java
diff --git a/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/AccountService.java b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/AccountService.java
index 4c72384e7b..4c72384e7b 100644
--- a/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/AccountService.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/AccountService.java
diff --git a/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java
index 2ce1e86062..2ce1e86062 100644
--- a/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java
diff --git a/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java
index a7703787fb..a7703787fb 100644
--- a/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java
diff --git a/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/BigBankServer.java b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/BigBankServer.java
index f5f1ca90b6..f5f1ca90b6 100644
--- a/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/BigBankServer.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/BigBankServer.java
diff --git a/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java
index bb8ff85f45..bb8ff85f45 100644
--- a/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java
diff --git a/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/ExchangeRate.java b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/ExchangeRate.java
index 358e5e19a2..358e5e19a2 100644
--- a/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/ExchangeRate.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/ExchangeRate.java
diff --git a/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java
index fcb3707cfe..fcb3707cfe 100644
--- a/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java
diff --git a/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java
index 26753a9e9e..26753a9e9e 100644
--- a/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java
diff --git a/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/StockValue.java b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/StockValue.java
index c300103398..c300103398 100644
--- a/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/StockValue.java
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/java/bigbank/StockValue.java
diff --git a/branches/sca-equinox/demos/xml-bigbank/src/main/resources/BigBank.composite b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/resources/BigBank.composite
index 8afde4bf80..8afde4bf80 100644
--- a/branches/sca-equinox/demos/xml-bigbank/src/main/resources/BigBank.composite
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/resources/BigBank.composite
diff --git a/branches/sca-equinox/demos/xml-bigbank/src/main/resources/accounts.xml b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/resources/accounts.xml
index 52ffd41fa7..52ffd41fa7 100644
--- a/branches/sca-equinox/demos/xml-bigbank/src/main/resources/accounts.xml
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/resources/accounts.xml
diff --git a/branches/sca-equinox/demos/xml-bigbank/src/main/resources/customer.xsd b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/resources/customer.xsd
index b22efb74c4..b22efb74c4 100644
--- a/branches/sca-equinox/demos/xml-bigbank/src/main/resources/customer.xsd
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/resources/customer.xsd
diff --git a/branches/sca-equinox/demos/xml-bigbank/src/main/resources/stock.xq b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/resources/stock.xq
index 03c19e457d..03c19e457d 100644
--- a/branches/sca-equinox/demos/xml-bigbank/src/main/resources/stock.xq
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/resources/stock.xq
diff --git a/branches/sca-equinox/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl
index 8411e22ff7..8411e22ff7 100644
--- a/branches/sca-equinox/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl
diff --git a/branches/sca-equinox/demos/xml-bigbank/xml-bigbank.png b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/xml-bigbank.png
index 0743a413a3..0743a413a3 100644
--- a/branches/sca-equinox/demos/xml-bigbank/xml-bigbank.png
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/xml-bigbank.png
diff --git a/branches/sca-equinox/demos/xml-bigbank/xml-bigbank.svg b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/xml-bigbank.svg
index c7acc03324..c7acc03324 100644
--- a/branches/sca-equinox/demos/xml-bigbank/xml-bigbank.svg
+++ b/sca-java-2.x/branches/sca-equinox/demos/xml-bigbank/xml-bigbank.svg
diff --git a/branches/sca-equinox/distribution/all/pom.xml b/sca-java-2.x/branches/sca-equinox/distribution/all/pom.xml
index 57c1a8a765..57c1a8a765 100644
--- a/branches/sca-equinox/distribution/all/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/all/pom.xml
diff --git a/branches/sca-equinox/distribution/all/src/main/assembly/bin.xml b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/assembly/bin.xml
index 1ee63f46cb..1ee63f46cb 100644
--- a/branches/sca-equinox/distribution/all/src/main/assembly/bin.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/assembly/bin.xml
diff --git a/branches/sca-equinox/distribution/all/src/main/assembly/src.xml b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/assembly/src.xml
index b771fadd92..b771fadd92 100644
--- a/branches/sca-equinox/distribution/all/src/main/assembly/src.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/assembly/src.xml
diff --git a/branches/sca-equinox/distribution/all/src/main/components/src-modules.xml b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/components/src-modules.xml
index f3320c3456..f3320c3456 100644
--- a/branches/sca-equinox/distribution/all/src/main/components/src-modules.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/components/src-modules.xml
diff --git a/branches/sca-equinox/distribution/all/src/main/release/CHANGES b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/branches/sca-equinox/distribution/all/src/main/release/CHANGES
+++ b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/release/CHANGES
diff --git a/branches/sca-equinox/distribution/all/src/main/release/DISCLAIMER b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-equinox/distribution/all/src/main/release/DISCLAIMER
+++ b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/release/DISCLAIMER
diff --git a/branches/sca-equinox/distribution/all/src/main/release/README b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/branches/sca-equinox/distribution/all/src/main/release/README
+++ b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/release/README
diff --git a/branches/sca-equinox/distribution/all/src/main/release/RELEASE_NOTES b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/branches/sca-equinox/distribution/all/src/main/release/RELEASE_NOTES
+++ b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-equinox/distribution/all/src/main/release/bin/INSTALL b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/branches/sca-equinox/distribution/all/src/main/release/bin/INSTALL
+++ b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/release/bin/INSTALL
diff --git a/branches/sca-equinox/distribution/all/src/main/release/bin/LICENSE b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/branches/sca-equinox/distribution/all/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/release/bin/LICENSE
diff --git a/branches/sca-equinox/distribution/all/src/main/release/bin/NOTICE b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/branches/sca-equinox/distribution/all/src/main/release/bin/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/release/bin/NOTICE
diff --git a/branches/sca-equinox/distribution/all/src/main/release/src/BUILDING b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/branches/sca-equinox/distribution/all/src/main/release/src/BUILDING
+++ b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/release/src/BUILDING
diff --git a/branches/sca-equinox/distribution/all/src/main/release/src/LICENSE b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/branches/sca-equinox/distribution/all/src/main/release/src/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/release/src/LICENSE
diff --git a/branches/sca-equinox/distribution/all/src/main/release/src/NOTICE b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/branches/sca-equinox/distribution/all/src/main/release/src/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/all/src/main/release/src/NOTICE
diff --git a/branches/sca-equinox/distribution/core/pom.xml b/sca-java-2.x/branches/sca-equinox/distribution/core/pom.xml
index 4d3f6956b1..4d3f6956b1 100644
--- a/branches/sca-equinox/distribution/core/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/core/pom.xml
diff --git a/branches/sca-equinox/distribution/core/src/main/assembly/bin.xml b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/assembly/bin.xml
index 1a6004b3a0..1a6004b3a0 100644
--- a/branches/sca-equinox/distribution/core/src/main/assembly/bin.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/assembly/bin.xml
diff --git a/branches/sca-equinox/distribution/core/src/main/assembly/src.xml b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/assembly/src.xml
index b814ee718b..b814ee718b 100644
--- a/branches/sca-equinox/distribution/core/src/main/assembly/src.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/assembly/src.xml
diff --git a/branches/sca-equinox/distribution/core/src/main/components/bin-common.xml b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/components/bin-common.xml
index c69e8e3699..c69e8e3699 100644
--- a/branches/sca-equinox/distribution/core/src/main/components/bin-common.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/components/bin-common.xml
diff --git a/branches/sca-equinox/distribution/core/src/main/components/bin-modules.xml b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/components/bin-modules.xml
index 5e1c5ec5d6..5e1c5ec5d6 100644
--- a/branches/sca-equinox/distribution/core/src/main/components/bin-modules.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/components/bin-modules.xml
diff --git a/branches/sca-equinox/distribution/core/src/main/components/bin-samples.xml b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/components/bin-samples.xml
index fbe46a296c..fbe46a296c 100644
--- a/branches/sca-equinox/distribution/core/src/main/components/bin-samples.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/components/bin-samples.xml
diff --git a/branches/sca-equinox/distribution/core/src/main/components/src-common.xml b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/components/src-common.xml
index 002df33fc7..002df33fc7 100644
--- a/branches/sca-equinox/distribution/core/src/main/components/src-common.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/components/src-common.xml
diff --git a/branches/sca-equinox/distribution/core/src/main/components/src-modules.xml b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/components/src-modules.xml
index 3a091b567b..3a091b567b 100644
--- a/branches/sca-equinox/distribution/core/src/main/components/src-modules.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/components/src-modules.xml
diff --git a/branches/sca-equinox/distribution/core/src/main/release/CHANGES b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/branches/sca-equinox/distribution/core/src/main/release/CHANGES
+++ b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/release/CHANGES
diff --git a/branches/sca-equinox/distribution/core/src/main/release/DISCLAIMER b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-equinox/distribution/core/src/main/release/DISCLAIMER
+++ b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/release/DISCLAIMER
diff --git a/branches/sca-equinox/distribution/core/src/main/release/README b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/branches/sca-equinox/distribution/core/src/main/release/README
+++ b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/release/README
diff --git a/branches/sca-equinox/distribution/core/src/main/release/RELEASE_NOTES b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/branches/sca-equinox/distribution/core/src/main/release/RELEASE_NOTES
+++ b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-equinox/distribution/core/src/main/release/bin/INSTALL b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/branches/sca-equinox/distribution/core/src/main/release/bin/INSTALL
+++ b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/release/bin/INSTALL
diff --git a/branches/sca-equinox/distribution/core/src/main/release/bin/LICENSE b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/branches/sca-equinox/distribution/core/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/release/bin/LICENSE
diff --git a/branches/sca-equinox/distribution/core/src/main/release/bin/NOTICE b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/branches/sca-equinox/distribution/core/src/main/release/bin/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/release/bin/NOTICE
diff --git a/branches/sca-equinox/distribution/core/src/main/release/src/BUILDING b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/branches/sca-equinox/distribution/core/src/main/release/src/BUILDING
+++ b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/release/src/BUILDING
diff --git a/branches/sca-equinox/distribution/core/src/main/release/src/LICENSE b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/branches/sca-equinox/distribution/core/src/main/release/src/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/release/src/LICENSE
diff --git a/branches/sca-equinox/distribution/core/src/main/release/src/NOTICE b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/branches/sca-equinox/distribution/core/src/main/release/src/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/core/src/main/release/src/NOTICE
diff --git a/branches/sca-equinox/distribution/ejava/pom.xml b/sca-java-2.x/branches/sca-equinox/distribution/ejava/pom.xml
index 86e7eaf4be..86e7eaf4be 100644
--- a/branches/sca-equinox/distribution/ejava/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/ejava/pom.xml
diff --git a/branches/sca-equinox/distribution/ejava/src/main/assembly/bin.xml b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/assembly/bin.xml
index c9df99effd..c9df99effd 100644
--- a/branches/sca-equinox/distribution/ejava/src/main/assembly/bin.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/assembly/bin.xml
diff --git a/branches/sca-equinox/distribution/ejava/src/main/assembly/src.xml b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/assembly/src.xml
index 6bd3ec9dda..6bd3ec9dda 100644
--- a/branches/sca-equinox/distribution/ejava/src/main/assembly/src.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/assembly/src.xml
diff --git a/branches/sca-equinox/distribution/ejava/src/main/components/bin-samples.xml b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/components/bin-samples.xml
index f1c691965b..f1c691965b 100644
--- a/branches/sca-equinox/distribution/ejava/src/main/components/bin-samples.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/components/bin-samples.xml
diff --git a/branches/sca-equinox/distribution/ejava/src/main/components/src-modules.xml b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/components/src-modules.xml
index 89a432e2cc..89a432e2cc 100644
--- a/branches/sca-equinox/distribution/ejava/src/main/components/src-modules.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/components/src-modules.xml
diff --git a/branches/sca-equinox/distribution/ejava/src/main/release/CHANGES b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/branches/sca-equinox/distribution/ejava/src/main/release/CHANGES
+++ b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/release/CHANGES
diff --git a/branches/sca-equinox/distribution/ejava/src/main/release/DISCLAIMER b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-equinox/distribution/ejava/src/main/release/DISCLAIMER
+++ b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/release/DISCLAIMER
diff --git a/branches/sca-equinox/distribution/ejava/src/main/release/README b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/branches/sca-equinox/distribution/ejava/src/main/release/README
+++ b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/release/README
diff --git a/branches/sca-equinox/distribution/ejava/src/main/release/RELEASE_NOTES b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/branches/sca-equinox/distribution/ejava/src/main/release/RELEASE_NOTES
+++ b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-equinox/distribution/ejava/src/main/release/bin/INSTALL b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/branches/sca-equinox/distribution/ejava/src/main/release/bin/INSTALL
+++ b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/release/bin/INSTALL
diff --git a/branches/sca-equinox/distribution/ejava/src/main/release/bin/LICENSE b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/branches/sca-equinox/distribution/ejava/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/release/bin/LICENSE
diff --git a/branches/sca-equinox/distribution/ejava/src/main/release/bin/NOTICE b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/branches/sca-equinox/distribution/ejava/src/main/release/bin/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/release/bin/NOTICE
diff --git a/branches/sca-equinox/distribution/ejava/src/main/release/src/BUILDING b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/branches/sca-equinox/distribution/ejava/src/main/release/src/BUILDING
+++ b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/release/src/BUILDING
diff --git a/branches/sca-equinox/distribution/ejava/src/main/release/src/LICENSE b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/branches/sca-equinox/distribution/ejava/src/main/release/src/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/release/src/LICENSE
diff --git a/branches/sca-equinox/distribution/ejava/src/main/release/src/NOTICE b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/branches/sca-equinox/distribution/ejava/src/main/release/src/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/ejava/src/main/release/src/NOTICE
diff --git a/branches/sca-equinox/distribution/etc/generate-all-maven-files.sh b/sca-java-2.x/branches/sca-equinox/distribution/etc/generate-all-maven-files.sh
index 4d1327f518..4d1327f518 100755
--- a/branches/sca-equinox/distribution/etc/generate-all-maven-files.sh
+++ b/sca-java-2.x/branches/sca-equinox/distribution/etc/generate-all-maven-files.sh
diff --git a/branches/sca-equinox/distribution/etc/generate-filtered-dependencies.sh b/sca-java-2.x/branches/sca-equinox/distribution/etc/generate-filtered-dependencies.sh
index 7a04369b50..7a04369b50 100755
--- a/branches/sca-equinox/distribution/etc/generate-filtered-dependencies.sh
+++ b/sca-java-2.x/branches/sca-equinox/distribution/etc/generate-filtered-dependencies.sh
diff --git a/branches/sca-equinox/distribution/etc/generate-maven-files.sh b/sca-java-2.x/branches/sca-equinox/distribution/etc/generate-maven-files.sh
index adb190eabd..adb190eabd 100755
--- a/branches/sca-equinox/distribution/etc/generate-maven-files.sh
+++ b/sca-java-2.x/branches/sca-equinox/distribution/etc/generate-maven-files.sh
diff --git a/branches/sca-equinox/distribution/etc/generate-pom.sh b/sca-java-2.x/branches/sca-equinox/distribution/etc/generate-pom.sh
index ce0228694c..ce0228694c 100755
--- a/branches/sca-equinox/distribution/etc/generate-pom.sh
+++ b/sca-java-2.x/branches/sca-equinox/distribution/etc/generate-pom.sh
diff --git a/branches/sca-equinox/distribution/etc/generate-src-modules.sh b/sca-java-2.x/branches/sca-equinox/distribution/etc/generate-src-modules.sh
index 60dbbcd2d0..60dbbcd2d0 100755
--- a/branches/sca-equinox/distribution/etc/generate-src-modules.sh
+++ b/sca-java-2.x/branches/sca-equinox/distribution/etc/generate-src-modules.sh
diff --git a/branches/sca-equinox/distribution/manager/pom.xml b/sca-java-2.x/branches/sca-equinox/distribution/manager/pom.xml
index ae74b44e40..ae74b44e40 100644
--- a/branches/sca-equinox/distribution/manager/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/manager/pom.xml
diff --git a/branches/sca-equinox/distribution/manager/src/main/assembly/bin.xml b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/assembly/bin.xml
index c9df99effd..c9df99effd 100644
--- a/branches/sca-equinox/distribution/manager/src/main/assembly/bin.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/assembly/bin.xml
diff --git a/branches/sca-equinox/distribution/manager/src/main/assembly/src.xml b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/assembly/src.xml
index 6bd3ec9dda..6bd3ec9dda 100644
--- a/branches/sca-equinox/distribution/manager/src/main/assembly/src.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/assembly/src.xml
diff --git a/branches/sca-equinox/distribution/manager/src/main/components/bin-samples.xml b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/components/bin-samples.xml
index d4b13c42e0..d4b13c42e0 100644
--- a/branches/sca-equinox/distribution/manager/src/main/components/bin-samples.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/components/bin-samples.xml
diff --git a/branches/sca-equinox/distribution/manager/src/main/components/src-modules.xml b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/components/src-modules.xml
index 3437db9cc5..3437db9cc5 100644
--- a/branches/sca-equinox/distribution/manager/src/main/components/src-modules.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/components/src-modules.xml
diff --git a/branches/sca-equinox/distribution/manager/src/main/release/CHANGES b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/branches/sca-equinox/distribution/manager/src/main/release/CHANGES
+++ b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/release/CHANGES
diff --git a/branches/sca-equinox/distribution/manager/src/main/release/DISCLAIMER b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-equinox/distribution/manager/src/main/release/DISCLAIMER
+++ b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/release/DISCLAIMER
diff --git a/branches/sca-equinox/distribution/manager/src/main/release/README b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/branches/sca-equinox/distribution/manager/src/main/release/README
+++ b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/release/README
diff --git a/branches/sca-equinox/distribution/manager/src/main/release/RELEASE_NOTES b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/branches/sca-equinox/distribution/manager/src/main/release/RELEASE_NOTES
+++ b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-equinox/distribution/manager/src/main/release/bin/INSTALL b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/branches/sca-equinox/distribution/manager/src/main/release/bin/INSTALL
+++ b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/release/bin/INSTALL
diff --git a/branches/sca-equinox/distribution/manager/src/main/release/bin/LICENSE b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/branches/sca-equinox/distribution/manager/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/release/bin/LICENSE
diff --git a/branches/sca-equinox/distribution/manager/src/main/release/bin/NOTICE b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/branches/sca-equinox/distribution/manager/src/main/release/bin/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/release/bin/NOTICE
diff --git a/branches/sca-equinox/distribution/manager/src/main/release/src/BUILDING b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/branches/sca-equinox/distribution/manager/src/main/release/src/BUILDING
+++ b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/release/src/BUILDING
diff --git a/branches/sca-equinox/distribution/manager/src/main/release/src/LICENSE b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/branches/sca-equinox/distribution/manager/src/main/release/src/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/release/src/LICENSE
diff --git a/branches/sca-equinox/distribution/manager/src/main/release/src/NOTICE b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/branches/sca-equinox/distribution/manager/src/main/release/src/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/manager/src/main/release/src/NOTICE
diff --git a/branches/sca-equinox/distribution/pdetarget/pom.xml b/sca-java-2.x/branches/sca-equinox/distribution/pdetarget/pom.xml
index 256b41c448..256b41c448 100644
--- a/branches/sca-equinox/distribution/pdetarget/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/pdetarget/pom.xml
diff --git a/branches/sca-equinox/distribution/pom.xml b/sca-java-2.x/branches/sca-equinox/distribution/pom.xml
index be546df199..be546df199 100644
--- a/branches/sca-equinox/distribution/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/pom.xml
diff --git a/branches/sca-equinox/distribution/process/pom.xml b/sca-java-2.x/branches/sca-equinox/distribution/process/pom.xml
index 9929034227..9929034227 100644
--- a/branches/sca-equinox/distribution/process/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/process/pom.xml
diff --git a/branches/sca-equinox/distribution/process/src/main/assembly/bin.xml b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/assembly/bin.xml
index c9df99effd..c9df99effd 100644
--- a/branches/sca-equinox/distribution/process/src/main/assembly/bin.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/assembly/bin.xml
diff --git a/branches/sca-equinox/distribution/process/src/main/assembly/src.xml b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/assembly/src.xml
index 6bd3ec9dda..6bd3ec9dda 100644
--- a/branches/sca-equinox/distribution/process/src/main/assembly/src.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/assembly/src.xml
diff --git a/branches/sca-equinox/distribution/process/src/main/components/bin-samples.xml b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/components/bin-samples.xml
index 8e8bc2e507..8e8bc2e507 100644
--- a/branches/sca-equinox/distribution/process/src/main/components/bin-samples.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/components/bin-samples.xml
diff --git a/branches/sca-equinox/distribution/process/src/main/components/src-modules.xml b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/components/src-modules.xml
index 68b2c39644..68b2c39644 100644
--- a/branches/sca-equinox/distribution/process/src/main/components/src-modules.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/components/src-modules.xml
diff --git a/branches/sca-equinox/distribution/process/src/main/release/CHANGES b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/branches/sca-equinox/distribution/process/src/main/release/CHANGES
+++ b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/release/CHANGES
diff --git a/branches/sca-equinox/distribution/process/src/main/release/DISCLAIMER b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-equinox/distribution/process/src/main/release/DISCLAIMER
+++ b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/release/DISCLAIMER
diff --git a/branches/sca-equinox/distribution/process/src/main/release/README b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/branches/sca-equinox/distribution/process/src/main/release/README
+++ b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/release/README
diff --git a/branches/sca-equinox/distribution/process/src/main/release/RELEASE_NOTES b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/branches/sca-equinox/distribution/process/src/main/release/RELEASE_NOTES
+++ b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-equinox/distribution/process/src/main/release/bin/INSTALL b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/branches/sca-equinox/distribution/process/src/main/release/bin/INSTALL
+++ b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/release/bin/INSTALL
diff --git a/branches/sca-equinox/distribution/process/src/main/release/bin/LICENSE b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/branches/sca-equinox/distribution/process/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/release/bin/LICENSE
diff --git a/branches/sca-equinox/distribution/process/src/main/release/bin/NOTICE b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/branches/sca-equinox/distribution/process/src/main/release/bin/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/release/bin/NOTICE
diff --git a/branches/sca-equinox/distribution/process/src/main/release/src/BUILDING b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/branches/sca-equinox/distribution/process/src/main/release/src/BUILDING
+++ b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/release/src/BUILDING
diff --git a/branches/sca-equinox/distribution/process/src/main/release/src/LICENSE b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/branches/sca-equinox/distribution/process/src/main/release/src/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/release/src/LICENSE
diff --git a/branches/sca-equinox/distribution/process/src/main/release/src/NOTICE b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/branches/sca-equinox/distribution/process/src/main/release/src/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/process/src/main/release/src/NOTICE
diff --git a/branches/sca-equinox/distribution/repository/pom.xml b/sca-java-2.x/branches/sca-equinox/distribution/repository/pom.xml
index db8344fa49..db8344fa49 100644
--- a/branches/sca-equinox/distribution/repository/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/repository/pom.xml
diff --git a/branches/sca-equinox/distribution/repository/src/main/assembly/repository.xml b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/assembly/repository.xml
index 87e20a870b..87e20a870b 100644
--- a/branches/sca-equinox/distribution/repository/src/main/assembly/repository.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/assembly/repository.xml
diff --git a/branches/sca-equinox/distribution/repository/src/main/components/src-modules.xml b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/components/src-modules.xml
index 0736faf913..0736faf913 100644
--- a/branches/sca-equinox/distribution/repository/src/main/components/src-modules.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/components/src-modules.xml
diff --git a/branches/sca-equinox/distribution/repository/src/main/release/CHANGES b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/branches/sca-equinox/distribution/repository/src/main/release/CHANGES
+++ b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/release/CHANGES
diff --git a/branches/sca-equinox/distribution/repository/src/main/release/DISCLAIMER b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-equinox/distribution/repository/src/main/release/DISCLAIMER
+++ b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/release/DISCLAIMER
diff --git a/branches/sca-equinox/distribution/repository/src/main/release/README b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/branches/sca-equinox/distribution/repository/src/main/release/README
+++ b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/release/README
diff --git a/branches/sca-equinox/distribution/repository/src/main/release/RELEASE_NOTES b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/branches/sca-equinox/distribution/repository/src/main/release/RELEASE_NOTES
+++ b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-equinox/distribution/repository/src/main/release/bin/INSTALL b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/branches/sca-equinox/distribution/repository/src/main/release/bin/INSTALL
+++ b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/release/bin/INSTALL
diff --git a/branches/sca-equinox/distribution/repository/src/main/release/bin/LICENSE b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/branches/sca-equinox/distribution/repository/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/release/bin/LICENSE
diff --git a/branches/sca-equinox/distribution/repository/src/main/release/bin/NOTICE b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/branches/sca-equinox/distribution/repository/src/main/release/bin/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/release/bin/NOTICE
diff --git a/branches/sca-equinox/distribution/repository/src/main/release/src/BUILDING b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/branches/sca-equinox/distribution/repository/src/main/release/src/BUILDING
+++ b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/release/src/BUILDING
diff --git a/branches/sca-equinox/distribution/repository/src/main/release/src/LICENSE b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/branches/sca-equinox/distribution/repository/src/main/release/src/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/release/src/LICENSE
diff --git a/branches/sca-equinox/distribution/repository/src/main/release/src/NOTICE b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/branches/sca-equinox/distribution/repository/src/main/release/src/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/repository/src/main/release/src/NOTICE
diff --git a/branches/sca-equinox/distribution/web20/pom.xml b/sca-java-2.x/branches/sca-equinox/distribution/web20/pom.xml
index 1d95f395d7..1d95f395d7 100644
--- a/branches/sca-equinox/distribution/web20/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/web20/pom.xml
diff --git a/branches/sca-equinox/distribution/web20/src/main/assembly/bin.xml b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/assembly/bin.xml
index c9df99effd..c9df99effd 100644
--- a/branches/sca-equinox/distribution/web20/src/main/assembly/bin.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/assembly/bin.xml
diff --git a/branches/sca-equinox/distribution/web20/src/main/assembly/src.xml b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/assembly/src.xml
index 6bd3ec9dda..6bd3ec9dda 100644
--- a/branches/sca-equinox/distribution/web20/src/main/assembly/src.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/assembly/src.xml
diff --git a/branches/sca-equinox/distribution/web20/src/main/components/bin-samples.xml b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/components/bin-samples.xml
index 5cc62040c0..5cc62040c0 100644
--- a/branches/sca-equinox/distribution/web20/src/main/components/bin-samples.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/components/bin-samples.xml
diff --git a/branches/sca-equinox/distribution/web20/src/main/components/src-modules.xml b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/components/src-modules.xml
index 68aae46796..68aae46796 100644
--- a/branches/sca-equinox/distribution/web20/src/main/components/src-modules.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/components/src-modules.xml
diff --git a/branches/sca-equinox/distribution/web20/src/main/release/CHANGES b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/branches/sca-equinox/distribution/web20/src/main/release/CHANGES
+++ b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/release/CHANGES
diff --git a/branches/sca-equinox/distribution/web20/src/main/release/DISCLAIMER b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-equinox/distribution/web20/src/main/release/DISCLAIMER
+++ b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/release/DISCLAIMER
diff --git a/branches/sca-equinox/distribution/web20/src/main/release/README b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/branches/sca-equinox/distribution/web20/src/main/release/README
+++ b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/release/README
diff --git a/branches/sca-equinox/distribution/web20/src/main/release/RELEASE_NOTES b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/branches/sca-equinox/distribution/web20/src/main/release/RELEASE_NOTES
+++ b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-equinox/distribution/web20/src/main/release/bin/INSTALL b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/branches/sca-equinox/distribution/web20/src/main/release/bin/INSTALL
+++ b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/release/bin/INSTALL
diff --git a/branches/sca-equinox/distribution/web20/src/main/release/bin/LICENSE b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/branches/sca-equinox/distribution/web20/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/release/bin/LICENSE
diff --git a/branches/sca-equinox/distribution/web20/src/main/release/bin/NOTICE b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/branches/sca-equinox/distribution/web20/src/main/release/bin/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/release/bin/NOTICE
diff --git a/branches/sca-equinox/distribution/web20/src/main/release/src/BUILDING b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/branches/sca-equinox/distribution/web20/src/main/release/src/BUILDING
+++ b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/release/src/BUILDING
diff --git a/branches/sca-equinox/distribution/web20/src/main/release/src/LICENSE b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/branches/sca-equinox/distribution/web20/src/main/release/src/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/release/src/LICENSE
diff --git a/branches/sca-equinox/distribution/web20/src/main/release/src/NOTICE b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/branches/sca-equinox/distribution/web20/src/main/release/src/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/web20/src/main/release/src/NOTICE
diff --git a/branches/sca-equinox/distribution/webservice/pom.xml b/sca-java-2.x/branches/sca-equinox/distribution/webservice/pom.xml
index 48c10217b2..48c10217b2 100644
--- a/branches/sca-equinox/distribution/webservice/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/webservice/pom.xml
diff --git a/branches/sca-equinox/distribution/webservice/src/main/assembly/bin.xml b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/assembly/bin.xml
index c9df99effd..c9df99effd 100644
--- a/branches/sca-equinox/distribution/webservice/src/main/assembly/bin.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/assembly/bin.xml
diff --git a/branches/sca-equinox/distribution/webservice/src/main/assembly/src.xml b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/assembly/src.xml
index 6bd3ec9dda..6bd3ec9dda 100644
--- a/branches/sca-equinox/distribution/webservice/src/main/assembly/src.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/assembly/src.xml
diff --git a/branches/sca-equinox/distribution/webservice/src/main/components/bin-samples.xml b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/components/bin-samples.xml
index 1bb5c20536..1bb5c20536 100644
--- a/branches/sca-equinox/distribution/webservice/src/main/components/bin-samples.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/components/bin-samples.xml
diff --git a/branches/sca-equinox/distribution/webservice/src/main/components/src-modules.xml b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/components/src-modules.xml
index d4c14d2d90..d4c14d2d90 100644
--- a/branches/sca-equinox/distribution/webservice/src/main/components/src-modules.xml
+++ b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/components/src-modules.xml
diff --git a/branches/sca-equinox/distribution/webservice/src/main/release/CHANGES b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/branches/sca-equinox/distribution/webservice/src/main/release/CHANGES
+++ b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/release/CHANGES
diff --git a/branches/sca-equinox/distribution/webservice/src/main/release/DISCLAIMER b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-equinox/distribution/webservice/src/main/release/DISCLAIMER
+++ b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/release/DISCLAIMER
diff --git a/branches/sca-equinox/distribution/webservice/src/main/release/README b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/branches/sca-equinox/distribution/webservice/src/main/release/README
+++ b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/release/README
diff --git a/branches/sca-equinox/distribution/webservice/src/main/release/RELEASE_NOTES b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/branches/sca-equinox/distribution/webservice/src/main/release/RELEASE_NOTES
+++ b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-equinox/distribution/webservice/src/main/release/bin/INSTALL b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/branches/sca-equinox/distribution/webservice/src/main/release/bin/INSTALL
+++ b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/release/bin/INSTALL
diff --git a/branches/sca-equinox/distribution/webservice/src/main/release/bin/LICENSE b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/branches/sca-equinox/distribution/webservice/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/release/bin/LICENSE
diff --git a/branches/sca-equinox/distribution/webservice/src/main/release/bin/NOTICE b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/branches/sca-equinox/distribution/webservice/src/main/release/bin/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/release/bin/NOTICE
diff --git a/branches/sca-equinox/distribution/webservice/src/main/release/src/BUILDING b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/branches/sca-equinox/distribution/webservice/src/main/release/src/BUILDING
+++ b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/release/src/BUILDING
diff --git a/branches/sca-equinox/distribution/webservice/src/main/release/src/LICENSE b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/branches/sca-equinox/distribution/webservice/src/main/release/src/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/release/src/LICENSE
diff --git a/branches/sca-equinox/distribution/webservice/src/main/release/src/NOTICE b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/branches/sca-equinox/distribution/webservice/src/main/release/src/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/distribution/webservice/src/main/release/src/NOTICE
diff --git a/branches/sca-equinox/itest/binding-sca-jms/client/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/client/pom.xml
index a0d5ae01bf..a0d5ae01bf 100644
--- a/branches/sca-equinox/itest/binding-sca-jms/client/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/client/pom.xml
diff --git a/branches/sca-equinox/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java
index d1b4ecbd15..d1b4ecbd15 100644
--- a/branches/sca-equinox/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java
diff --git a/branches/sca-equinox/itest/binding-sca-jms/client/src/main/java/itest/MyService.java b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/client/src/main/java/itest/MyService.java
index e5123f087c..e5123f087c 100644
--- a/branches/sca-equinox/itest/binding-sca-jms/client/src/main/java/itest/MyService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/client/src/main/java/itest/MyService.java
diff --git a/branches/sca-equinox/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml
index 8c311553c3..8c311553c3 100644
--- a/branches/sca-equinox/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/binding-sca-jms/client/src/main/resources/MyClient.composite b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/client/src/main/resources/MyClient.composite
index 81aa3ed98d..81aa3ed98d 100644
--- a/branches/sca-equinox/itest/binding-sca-jms/client/src/main/resources/MyClient.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/client/src/main/resources/MyClient.composite
diff --git a/branches/sca-equinox/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java
index 5c56dbaf84..5c56dbaf84 100644
--- a/branches/sca-equinox/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java
diff --git a/branches/sca-equinox/itest/binding-sca-jms/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/pom.xml
index ea70b4ff14..ea70b4ff14 100644
--- a/branches/sca-equinox/itest/binding-sca-jms/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/pom.xml
diff --git a/branches/sca-equinox/itest/binding-sca-jms/service/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/service/pom.xml
index b2f0e74c39..b2f0e74c39 100644
--- a/branches/sca-equinox/itest/binding-sca-jms/service/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/service/pom.xml
diff --git a/branches/sca-equinox/itest/binding-sca-jms/service/src/main/java/itest/MyService.java b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/service/src/main/java/itest/MyService.java
index e5123f087c..e5123f087c 100644
--- a/branches/sca-equinox/itest/binding-sca-jms/service/src/main/java/itest/MyService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/service/src/main/java/itest/MyService.java
diff --git a/branches/sca-equinox/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java
index d0f8dcc393..d0f8dcc393 100644
--- a/branches/sca-equinox/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java
diff --git a/branches/sca-equinox/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml
index 8c311553c3..8c311553c3 100644
--- a/branches/sca-equinox/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/binding-sca-jms/service/src/main/resources/MyService.composite b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/service/src/main/resources/MyService.composite
index 03ac786809..03ac786809 100644
--- a/branches/sca-equinox/itest/binding-sca-jms/service/src/main/resources/MyService.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/service/src/main/resources/MyService.composite
diff --git a/branches/sca-equinox/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java
index cb79ae050a..cb79ae050a 100644
--- a/branches/sca-equinox/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java
diff --git a/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml
index 658f806a8b..658f806a8b 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml
diff --git a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
index 532b84bd22..532b84bd22 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
diff --git a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
index 86d7f245e8..86d7f245e8 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
diff --git a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
index 8dea2715bf..8dea2715bf 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
diff --git a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
index 672dbdc0b5..672dbdc0b5 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
index d7ebd5cbb8..d7ebd5cbb8 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
index bdfedee2f8..bdfedee2f8 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
index dfec43e8e1..dfec43e8e1 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
diff --git a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
index e768707ccd..e768707ccd 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
diff --git a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml
index 25d676bcfc..25d676bcfc 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml
diff --git a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
index 5ec2cc9f2e..5ec2cc9f2e 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
diff --git a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType
index 13d12e32a0..13d12e32a0 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType
diff --git a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
index 504e2ccc5d..504e2ccc5d 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
index 0f51b96b27..0f51b96b27 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
diff --git a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/log4j.properties b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
index 4e13380e0b..4e13380e0b 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
diff --git a/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml
index 7bce6ebbe7..7bce6ebbe7 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml
diff --git a/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
index ffdbc50a22..ffdbc50a22 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
diff --git a/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
index 6971151a77..6971151a77 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/helloworld/deploy.xml b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/helloworld/deploy.xml
index 9bd95b2c58..9bd95b2c58 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/helloworld/deploy.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/helloworld/deploy.xml
diff --git a/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
diff --git a/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.componentType b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.componentType
diff --git a/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
index f864f45613..f864f45613 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
index 610bda3cc4..610bda3cc4 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
diff --git a/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/log4j.properties b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
index 37f66e4189..37f66e4189 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
diff --git a/branches/sca-equinox/itest/bpel/helloworld/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld/pom.xml
index b23ef98bd6..b23ef98bd6 100644
--- a/branches/sca-equinox/itest/bpel/helloworld/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld/pom.xml
diff --git a/branches/sca-equinox/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
index ffdbc50a22..ffdbc50a22 100644
--- a/branches/sca-equinox/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
diff --git a/branches/sca-equinox/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
index 76fcd35c2d..76fcd35c2d 100644
--- a/branches/sca-equinox/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml
index 9bd95b2c58..9bd95b2c58 100644
--- a/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml
diff --git a/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
diff --git a/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType
diff --git a/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
index f6b12fb14b..f6b12fb14b 100644
--- a/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
index 610bda3cc4..610bda3cc4 100644
--- a/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
diff --git a/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/log4j.properties b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/log4j.properties
index 37f66e4189..37f66e4189 100644
--- a/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/log4j.properties
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/helloworld/src/test/resources/log4j.properties
diff --git a/branches/sca-equinox/itest/bpel/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/bpel/pom.xml
index 7504102a21..7504102a21 100644
--- a/branches/sca-equinox/itest/bpel/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/bpel/pom.xml
diff --git a/branches/sca-equinox/itest/build-was-integration.xml b/sca-java-2.x/branches/sca-equinox/itest/build-was-integration.xml
index 03de4c050f..03de4c050f 100644
--- a/branches/sca-equinox/itest/build-was-integration.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/build-was-integration.xml
diff --git a/branches/sca-equinox/itest/builder/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/builder/pom.xml
index e2d23afd5c..e2d23afd5c 100644
--- a/branches/sca-equinox/itest/builder/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/pom.xml
diff --git a/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
index 932ae3987a..932ae3987a 100644
--- a/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
diff --git a/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
index f9ef0a1b4f..f9ef0a1b4f 100644
--- a/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
diff --git a/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
index c041a76b47..c041a76b47 100644
--- a/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
diff --git a/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
index ccfeff0997..ccfeff0997 100644
--- a/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
diff --git a/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
index 9a775feec9..9a775feec9 100644
--- a/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
diff --git a/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
index 98a1741fb6..98a1741fb6 100644
--- a/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
index 256d01be58..256d01be58 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario1/scenario1.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario1/scenario1.composite
index 5c2a98ab40..5c2a98ab40 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario1/scenario1.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario1/scenario1.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario1/scenario1a.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario1/scenario1a.composite
index 21b5897aa1..21b5897aa1 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario1/scenario1a.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario1/scenario1a.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
index 083079ba42..083079ba42 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario10/scenario10.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario10/scenario10.composite
index c24b7f0046..c24b7f0046 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario10/scenario10.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario10/scenario10.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario10/scenario10a.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario10/scenario10a.composite
index 27a73d5c41..27a73d5c41 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario10/scenario10a.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario10/scenario10a.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario10/service3.wsdl b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario10/service3.wsdl
index 14edcc00e6..14edcc00e6 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario10/service3.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario10/service3.wsdl
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
index a6e4b65970..a6e4b65970 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario11/scenario11.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario11/scenario11.composite
index 3a94152e6a..3a94152e6a 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario11/scenario11.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario11/scenario11.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario11/scenario11a.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario11/scenario11a.composite
index 6130c68651..6130c68651 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario11/scenario11a.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario11/scenario11a.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario11/service3.wsdl b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario11/service3.wsdl
index 14edcc00e6..14edcc00e6 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario11/service3.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario11/service3.wsdl
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
index 125bdc5e53..125bdc5e53 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario12/scenario12.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario12/scenario12.composite
index aabd445e23..aabd445e23 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario12/scenario12.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario12/scenario12.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario12/scenario12a.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario12/scenario12a.composite
index a2ccc47c28..a2ccc47c28 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario12/scenario12a.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario12/scenario12a.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
index c906c6c5b0..c906c6c5b0 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario13/scenario13.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario13/scenario13.composite
index ed59cd2adf..ed59cd2adf 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario13/scenario13.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario13/scenario13.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario13/scenario13a.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario13/scenario13a.composite
index 41150f78fd..41150f78fd 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario13/scenario13a.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario13/scenario13a.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
index 6fa901c4df..6fa901c4df 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario2/scenario2.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario2/scenario2.composite
index 66f88294ff..66f88294ff 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario2/scenario2.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario2/scenario2.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario2/scenario2a.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario2/scenario2a.composite
index db1af4743f..db1af4743f 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario2/scenario2a.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario2/scenario2a.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
index f5899ab1f0..f5899ab1f0 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario3/scenario3.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario3/scenario3.composite
index 4b37c19e4e..4b37c19e4e 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario3/scenario3.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario3/scenario3.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario3/scenario3a.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario3/scenario3a.composite
index fedd79ff3d..fedd79ff3d 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario3/scenario3a.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario3/scenario3a.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
index 642245ea7e..642245ea7e 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario4/scenario4.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario4/scenario4.composite
index 1bb876b33d..1bb876b33d 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario4/scenario4.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario4/scenario4.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario4/scenario4a.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario4/scenario4a.composite
index 55e13700a6..55e13700a6 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario4/scenario4a.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario4/scenario4a.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
index 92da17179f..92da17179f 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario5/scenario5.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario5/scenario5.composite
index 403e19b087..403e19b087 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario5/scenario5.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario5/scenario5.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario5/scenario5a.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario5/scenario5a.composite
index 0e37ded0e4..0e37ded0e4 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario5/scenario5a.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario5/scenario5a.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario5/scenarios.wsdl b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario5/scenarios.wsdl
index 7480419231..7480419231 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario5/scenarios.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario5/scenarios.wsdl
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
index 42d45b0b98..42d45b0b98 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario6/scenario6.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario6/scenario6.composite
index 1c89139905..1c89139905 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario6/scenario6.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario6/scenario6.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario6/scenario6a.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario6/scenario6a.composite
index 853703a353..853703a353 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario6/scenario6a.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario6/scenario6a.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario6/scenarios.wsdl b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario6/scenarios.wsdl
index 7480419231..7480419231 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario6/scenarios.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario6/scenarios.wsdl
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
index 44c471cc65..44c471cc65 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario7/scenario7.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario7/scenario7.composite
index 6b1ac24cec..6b1ac24cec 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario7/scenario7.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario7/scenario7.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario7/scenario7a.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario7/scenario7a.composite
index 8e0cebbdd5..8e0cebbdd5 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario7/scenario7a.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario7/scenario7a.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario7/scenarios.wsdl b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario7/scenarios.wsdl
index 7480419231..7480419231 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario7/scenarios.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario7/scenarios.wsdl
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
index 7cb09d0a74..7cb09d0a74 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario8/scenario8.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario8/scenario8.composite
index 26e5ee33fa..26e5ee33fa 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario8/scenario8.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario8/scenario8.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario8/scenario8a.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario8/scenario8a.composite
index 4fa0712199..4fa0712199 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario8/scenario8a.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario8/scenario8a.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario8/scenarios.wsdl b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario8/scenarios.wsdl
index 7480419231..7480419231 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario8/scenarios.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario8/scenarios.wsdl
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
index 6e0908702b..6e0908702b 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario9/scenario9.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario9/scenario9.composite
index 3fce35470e..3fce35470e 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario9/scenario9.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario9/scenario9.composite
diff --git a/branches/sca-equinox/itest/builder/src/main/resources/scenario9/scenario9a.composite b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario9/scenario9a.composite
index 6e86c547b3..6e86c547b3 100644
--- a/branches/sca-equinox/itest/builder/src/main/resources/scenario9/scenario9a.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/main/resources/scenario9/scenario9a.composite
diff --git a/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
index 1f45cb4a66..1f45cb4a66 100644
--- a/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
diff --git a/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java b/sca-java-2.x/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
index c9339c1545..c9339c1545 100644
--- a/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
diff --git a/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java b/sca-java-2.x/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
index 4b3485f088..4b3485f088 100644
--- a/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
diff --git a/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java b/sca-java-2.x/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
index 9bff4d394e..9bff4d394e 100644
--- a/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
diff --git a/branches/sca-equinox/itest/callablereferences-ws/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/pom.xml
index 08f37e6457..08f37e6457 100644
--- a/branches/sca-equinox/itest/callablereferences-ws/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/pom.xml
diff --git a/branches/sca-equinox/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
index ecf1ac27e1..ecf1ac27e1 100644
--- a/branches/sca-equinox/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
diff --git a/branches/sca-equinox/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
index c46087d865..c46087d865 100644
--- a/branches/sca-equinox/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
diff --git a/branches/sca-equinox/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
index 670c145cc3..670c145cc3 100644
--- a/branches/sca-equinox/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
diff --git a/branches/sca-equinox/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
index eb4d647a22..eb4d647a22 100644
--- a/branches/sca-equinox/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
diff --git a/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
index bb5e57397d..bb5e57397d 100644
--- a/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
diff --git a/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
index 6e5f1cedf9..6e5f1cedf9 100644
--- a/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
diff --git a/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
index 995e4fcf39..995e4fcf39 100644
--- a/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
diff --git a/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
index be72fd779e..be72fd779e 100644
--- a/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
diff --git a/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
index b73f26b573..b73f26b573 100644
--- a/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
diff --git a/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
index c3abc4c65d..c3abc4c65d 100644
--- a/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
diff --git a/branches/sca-equinox/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
index 3d782a0b84..3d782a0b84 100644
--- a/branches/sca-equinox/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
diff --git a/branches/sca-equinox/itest/callablereferences-ws/src/main/resources/example.composite b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/resources/example.composite
index ea0819a32e..ea0819a32e 100644
--- a/branches/sca-equinox/itest/callablereferences-ws/src/main/resources/example.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/main/resources/example.composite
diff --git a/branches/sca-equinox/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
index 310e31fb02..310e31fb02 100644
--- a/branches/sca-equinox/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
diff --git a/branches/sca-equinox/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
index 66fb2ef96c..66fb2ef96c 100644
--- a/branches/sca-equinox/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
diff --git a/branches/sca-equinox/itest/callablereferences/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/pom.xml
index 7548d39ba5..7548d39ba5 100644
--- a/branches/sca-equinox/itest/callablereferences/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/pom.xml
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
index 5934f16851..5934f16851 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
index 7c2fd092dc..7c2fd092dc 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
index ade672b0ab..ade672b0ab 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
index 518e77d3a8..518e77d3a8 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
index fdf80cc1c8..fdf80cc1c8 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
index cc8ec8f000..cc8ec8f000 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
index 48b697df31..48b697df31 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
index 27ad48b9fe..27ad48b9fe 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java
index abcedfa6e1..abcedfa6e1 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
index f2e0ce7582..f2e0ce7582 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
index ab21421c4d..ab21421c4d 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
index 5b5984b164..5b5984b164 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
index 223c467f47..223c467f47 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
index ed4e66bec3..ed4e66bec3 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
index e32051373f..e32051373f 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
index adf5a1c1ce..adf5a1c1ce 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
index 0bf8f7ef1e..0bf8f7ef1e 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
index 5b3add1e61..5b3add1e61 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceTest.composite b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
index 49b75f56e4..49b75f56e4 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
index 9216f44191..9216f44191 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
index 95021f72a4..95021f72a4 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
index 42d739564c..42d739564c 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
diff --git a/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 2edda61601..2edda61601 100644
--- a/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
index a9cbb5d0a1..a9cbb5d0a1 100644
--- a/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
diff --git a/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
index 927e91a8bc..927e91a8bc 100644
--- a/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
diff --git a/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
index f2d8fe5d64..f2d8fe5d64 100644
--- a/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
diff --git a/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
index d785a6a397..d785a6a397 100644
--- a/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
diff --git a/branches/sca-equinox/itest/callback-api/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/callback-api/pom.xml
index da93a9e6fe..da93a9e6fe 100644
--- a/branches/sca-equinox/itest/callback-api/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-api/pom.xml
diff --git a/branches/sca-equinox/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/sca-java-2.x/branches/sca-equinox/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
index de17ba2f0d..de17ba2f0d 100644
--- a/branches/sca-equinox/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
diff --git a/branches/sca-equinox/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/sca-java-2.x/branches/sca-equinox/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
index 5fd4a71466..5fd4a71466 100644
--- a/branches/sca-equinox/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
diff --git a/branches/sca-equinox/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
index 274984abb3..274984abb3 100644
--- a/branches/sca-equinox/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
diff --git a/branches/sca-equinox/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/sca-java-2.x/branches/sca-equinox/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
index 33de1e7739..33de1e7739 100644
--- a/branches/sca-equinox/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
diff --git a/branches/sca-equinox/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
index 61e2c7ee8f..61e2c7ee8f 100644
--- a/branches/sca-equinox/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
diff --git a/branches/sca-equinox/itest/callback-api/src/main/resources/CallBackApiTest.composite b/sca-java-2.x/branches/sca-equinox/itest/callback-api/src/main/resources/CallBackApiTest.composite
index 946c4862ee..946c4862ee 100644
--- a/branches/sca-equinox/itest/callback-api/src/main/resources/CallBackApiTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-api/src/main/resources/CallBackApiTest.composite
diff --git a/branches/sca-equinox/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
index 19eb25631e..19eb25631e 100644
--- a/branches/sca-equinox/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
index 9471049c74..9471049c74 100644
--- a/branches/sca-equinox/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
diff --git a/branches/sca-equinox/itest/callback-basic/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/callback-basic/pom.xml
index 54403a30d6..54403a30d6 100644
--- a/branches/sca-equinox/itest/callback-basic/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-basic/pom.xml
diff --git a/branches/sca-equinox/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-2.x/branches/sca-equinox/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
index 5e9d3d6821..5e9d3d6821 100644
--- a/branches/sca-equinox/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
diff --git a/branches/sca-equinox/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-2.x/branches/sca-equinox/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
index 9f4019f28c..9f4019f28c 100644
--- a/branches/sca-equinox/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
diff --git a/branches/sca-equinox/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
index e0e6d7eb8c..e0e6d7eb8c 100644
--- a/branches/sca-equinox/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
diff --git a/branches/sca-equinox/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-2.x/branches/sca-equinox/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
index bd41fa7037..bd41fa7037 100644
--- a/branches/sca-equinox/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
diff --git a/branches/sca-equinox/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
index 4ca2dc9af9..4ca2dc9af9 100644
--- a/branches/sca-equinox/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
diff --git a/branches/sca-equinox/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/sca-java-2.x/branches/sca-equinox/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
index c506956088..c506956088 100644
--- a/branches/sca-equinox/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
diff --git a/branches/sca-equinox/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
index adf28214f6..adf28214f6 100644
--- a/branches/sca-equinox/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
index 32c26a348a..32c26a348a 100644
--- a/branches/sca-equinox/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
diff --git a/branches/sca-equinox/itest/callback-complex-type/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/callback-complex-type/pom.xml
index 9bcb760538..9bcb760538 100644
--- a/branches/sca-equinox/itest/callback-complex-type/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-complex-type/pom.xml
diff --git a/branches/sca-equinox/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/sca-java-2.x/branches/sca-equinox/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
index 9fddb850ba..9fddb850ba 100644
--- a/branches/sca-equinox/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
diff --git a/branches/sca-equinox/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/sca-java-2.x/branches/sca-equinox/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
index 739983c277..739983c277 100644
--- a/branches/sca-equinox/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
diff --git a/branches/sca-equinox/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
index d2b03fcde7..d2b03fcde7 100644
--- a/branches/sca-equinox/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
diff --git a/branches/sca-equinox/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/sca-java-2.x/branches/sca-equinox/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
index ffbf4f35fa..ffbf4f35fa 100644
--- a/branches/sca-equinox/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
diff --git a/branches/sca-equinox/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
index dc31ed156b..dc31ed156b 100644
--- a/branches/sca-equinox/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
diff --git a/branches/sca-equinox/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/sca-java-2.x/branches/sca-equinox/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
index 3f48f16389..3f48f16389 100644
--- a/branches/sca-equinox/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
diff --git a/branches/sca-equinox/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/sca-java-2.x/branches/sca-equinox/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
index ff38134df5..ff38134df5 100644
--- a/branches/sca-equinox/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
diff --git a/branches/sca-equinox/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java b/sca-java-2.x/branches/sca-equinox/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
index 33d1afaecd..33d1afaecd 100644
--- a/branches/sca-equinox/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
diff --git a/branches/sca-equinox/itest/callback-id/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/callback-id/pom.xml
index 7523306d92..7523306d92 100644
--- a/branches/sca-equinox/itest/callback-id/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-id/pom.xml
diff --git a/branches/sca-equinox/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java b/sca-java-2.x/branches/sca-equinox/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
index b14560a8c3..b14560a8c3 100644
--- a/branches/sca-equinox/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
diff --git a/branches/sca-equinox/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java b/sca-java-2.x/branches/sca-equinox/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
index a9e551f8b4..a9e551f8b4 100644
--- a/branches/sca-equinox/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
diff --git a/branches/sca-equinox/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
index 59c9c3d069..59c9c3d069 100644
--- a/branches/sca-equinox/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
diff --git a/branches/sca-equinox/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java b/sca-java-2.x/branches/sca-equinox/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
index 18c592a1c1..18c592a1c1 100644
--- a/branches/sca-equinox/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
diff --git a/branches/sca-equinox/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
index 8b0a4b69cf..8b0a4b69cf 100644
--- a/branches/sca-equinox/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
diff --git a/branches/sca-equinox/itest/callback-id/src/main/resources/CallBackIdClient.composite b/sca-java-2.x/branches/sca-equinox/itest/callback-id/src/main/resources/CallBackIdClient.composite
index c9a6ba6258..c9a6ba6258 100644
--- a/branches/sca-equinox/itest/callback-id/src/main/resources/CallBackIdClient.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-id/src/main/resources/CallBackIdClient.composite
diff --git a/branches/sca-equinox/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
index 771fbb8ff7..771fbb8ff7 100644
--- a/branches/sca-equinox/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
diff --git a/branches/sca-equinox/itest/callback-multiple-wires/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/callback-multiple-wires/pom.xml
index ad236df1ad..ad236df1ad 100644
--- a/branches/sca-equinox/itest/callback-multiple-wires/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-multiple-wires/pom.xml
diff --git a/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java b/sca-java-2.x/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
index 7c80d222fc..7c80d222fc 100644
--- a/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
diff --git a/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java b/sca-java-2.x/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
index df91f3d268..df91f3d268 100644
--- a/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
diff --git a/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java b/sca-java-2.x/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
index a0a9564002..a0a9564002 100644
--- a/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
diff --git a/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java b/sca-java-2.x/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
index cfd601f546..cfd601f546 100644
--- a/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
diff --git a/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java b/sca-java-2.x/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
index f198efae51..f198efae51 100644
--- a/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
diff --git a/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
index d19b3fe355..d19b3fe355 100644
--- a/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
diff --git a/branches/sca-equinox/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite b/sca-java-2.x/branches/sca-equinox/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
index 3dae3ca3a8..3dae3ca3a8 100644
--- a/branches/sca-equinox/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
diff --git a/branches/sca-equinox/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
index 3c83e4bedd..3c83e4bedd 100644
--- a/branches/sca-equinox/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
diff --git a/branches/sca-equinox/itest/callback-separatethread/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/callback-separatethread/pom.xml
index f3a75c4623..f3a75c4623 100644
--- a/branches/sca-equinox/itest/callback-separatethread/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-separatethread/pom.xml
diff --git a/branches/sca-equinox/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java b/sca-java-2.x/branches/sca-equinox/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
index f812a39058..f812a39058 100644
--- a/branches/sca-equinox/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
diff --git a/branches/sca-equinox/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
index e861f8a3d1..e861f8a3d1 100644
--- a/branches/sca-equinox/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
diff --git a/branches/sca-equinox/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java b/sca-java-2.x/branches/sca-equinox/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
index ae41f596fc..ae41f596fc 100644
--- a/branches/sca-equinox/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
diff --git a/branches/sca-equinox/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java b/sca-java-2.x/branches/sca-equinox/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
index c22b8cceec..c22b8cceec 100644
--- a/branches/sca-equinox/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
diff --git a/branches/sca-equinox/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
index 4d672b3a8b..4d672b3a8b 100644
--- a/branches/sca-equinox/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
diff --git a/branches/sca-equinox/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite b/sca-java-2.x/branches/sca-equinox/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
index e111e5074c..e111e5074c 100644
--- a/branches/sca-equinox/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
diff --git a/branches/sca-equinox/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
index f7e7be2133..f7e7be2133 100644
--- a/branches/sca-equinox/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
diff --git a/branches/sca-equinox/itest/callback-set-callback/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/callback-set-callback/pom.xml
index d7ea83853d..d7ea83853d 100644
--- a/branches/sca-equinox/itest/callback-set-callback/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-set-callback/pom.xml
diff --git a/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java b/sca-java-2.x/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
index 3b9599f53f..3b9599f53f 100644
--- a/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
diff --git a/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java b/sca-java-2.x/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
index 48752f2ea1..48752f2ea1 100644
--- a/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
diff --git a/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java b/sca-java-2.x/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
index ad0e0603a3..ad0e0603a3 100644
--- a/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
diff --git a/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
index 0a22b0e01f..0a22b0e01f 100644
--- a/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
diff --git a/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java b/sca-java-2.x/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
index 94cb6aa73b..94cb6aa73b 100644
--- a/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
diff --git a/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
index 66e4d3fc05..66e4d3fc05 100644
--- a/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
diff --git a/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java b/sca-java-2.x/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
index afedcdf7f1..afedcdf7f1 100644
--- a/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
diff --git a/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
index 4a6c9dbaa6..4a6c9dbaa6 100644
--- a/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
diff --git a/branches/sca-equinox/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite b/sca-java-2.x/branches/sca-equinox/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
index 3552ddecab..3552ddecab 100644
--- a/branches/sca-equinox/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
diff --git a/branches/sca-equinox/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
index 496ae0b1a5..496ae0b1a5 100644
--- a/branches/sca-equinox/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
diff --git a/branches/sca-equinox/itest/callback-set-conversation/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/callback-set-conversation/pom.xml
index 8e3e052809..8e3e052809 100644
--- a/branches/sca-equinox/itest/callback-set-conversation/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-set-conversation/pom.xml
diff --git a/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java b/sca-java-2.x/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
index d97c69eaed..d97c69eaed 100644
--- a/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
diff --git a/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java b/sca-java-2.x/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
index a704fd0ece..a704fd0ece 100644
--- a/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
diff --git a/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java b/sca-java-2.x/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
index 013424bf5e..013424bf5e 100644
--- a/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
diff --git a/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
index 5d692e7728..5d692e7728 100644
--- a/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
diff --git a/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java b/sca-java-2.x/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
index 75a4a3a6a0..75a4a3a6a0 100644
--- a/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
diff --git a/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java b/sca-java-2.x/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
index e7a3b144f6..e7a3b144f6 100644
--- a/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
diff --git a/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java b/sca-java-2.x/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
index 692b6dfc35..692b6dfc35 100644
--- a/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
diff --git a/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
index bca94ce407..bca94ce407 100644
--- a/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
diff --git a/branches/sca-equinox/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite b/sca-java-2.x/branches/sca-equinox/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
index ce73417f94..ce73417f94 100644
--- a/branches/sca-equinox/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
diff --git a/branches/sca-equinox/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
index 45bdaea9ab..45bdaea9ab 100644
--- a/branches/sca-equinox/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
diff --git a/branches/sca-equinox/itest/component-type/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/component-type/pom.xml
index b8baf9b95a..b8baf9b95a 100644
--- a/branches/sca-equinox/itest/component-type/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/component-type/pom.xml
diff --git a/branches/sca-equinox/itest/component-type/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-equinox/itest/component-type/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/itest/component-type/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/branches/sca-equinox/itest/component-type/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/itest/component-type/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/java/calculator/CalculatorClient.java
index 08afd922b3..08afd922b3 100644
--- a/branches/sca-equinox/itest/component-type/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/itest/component-type/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-equinox/itest/component-type/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
index 1209ac128a..1209ac128a 100644
--- a/branches/sca-equinox/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/itest/component-type/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-equinox/itest/component-type/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/itest/component-type/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-equinox/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/itest/component-type/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-equinox/itest/component-type/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-equinox/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/itest/component-type/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-equinox/itest/component-type/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-equinox/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/itest/component-type/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/resources/Calculator.composite
index b229787657..b229787657 100644
--- a/branches/sca-equinox/itest/component-type/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
index 00c48e5a35..00c48e5a35 100644
--- a/branches/sca-equinox/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
diff --git a/branches/sca-equinox/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
index 74bedc0a98..74bedc0a98 100644
--- a/branches/sca-equinox/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
diff --git a/branches/sca-equinox/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
index 289fcc3e11..289fcc3e11 100644
--- a/branches/sca-equinox/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
diff --git a/branches/sca-equinox/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
index 2d8a879cda..2d8a879cda 100644
--- a/branches/sca-equinox/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
diff --git a/branches/sca-equinox/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
index 6214955141..6214955141 100644
--- a/branches/sca-equinox/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
diff --git a/branches/sca-equinox/itest/component-type/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
index 08fc8e33bf..08fc8e33bf 100644
--- a/branches/sca-equinox/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/build-jar.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/build-jar.xml
index 299ce6864f..299ce6864f 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/build-jar.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/build-jar.xml
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/pom.xml
index 63bce7556c..63bce7556c 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/pom.xml
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
index 814c38777a..814c38777a 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index e4daf0ec02..e4daf0ec02 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
index e4b3bc7048..e4b3bc7048 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index 698aa2aa5d..698aa2aa5d 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 9e01f00a79..9e01f00a79 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index cdd12d589d..cdd12d589d 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
index 714d1826e1..714d1826e1 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
index 7f7dc969e2..7f7dc969e2 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
index 7f7dc969e2..7f7dc969e2 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
index 8a2bec308f..8a2bec308f 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
index c77c4c1c7e..c77c4c1c7e 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
index 210a68011f..210a68011f 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
index d118cceef9..d118cceef9 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
index d37b6659da..d37b6659da 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
index 77b28d9023..77b28d9023 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
index 8ec290a831..8ec290a831 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
index 1398416978..1398416978 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
index db1f0d34e7..db1f0d34e7 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
index 5be79b741a..5be79b741a 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
index a76fae8090..a76fae8090 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-test/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-test/pom.xml
index 4bfad25131..4bfad25131 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-test/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-test/pom.xml
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
index 18fc2bbc88..18fc2bbc88 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
index 1ec7aaaa3a..1ec7aaaa3a 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
index b123951ef6..b123951ef6 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
diff --git a/branches/sca-equinox/itest/contribution-classloader/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/pom.xml
index 613a9d36db..613a9d36db 100644
--- a/branches/sca-equinox/itest/contribution-classloader/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-classloader/pom.xml
diff --git a/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml
index 143de4ae5d..143de4ae5d 100644
--- a/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml
diff --git a/branches/sca-equinox/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
index e65422136f..e65422136f 100644
--- a/branches/sca-equinox/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
diff --git a/branches/sca-equinox/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
index 5369c18497..5369c18497 100644
--- a/branches/sca-equinox/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
diff --git a/branches/sca-equinox/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
index 3c14560a56..3c14560a56 100644
--- a/branches/sca-equinox/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
index 636b7111d9..636b7111d9 100644
--- a/branches/sca-equinox/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
diff --git a/branches/sca-equinox/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
index 72b77564d2..72b77564d2 100644
--- a/branches/sca-equinox/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
diff --git a/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml
index 5d748b3de6..5d748b3de6 100644
--- a/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml
diff --git a/branches/sca-equinox/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
index 74d22ed830..74d22ed830 100644
--- a/branches/sca-equinox/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
index dc33dfa560..dc33dfa560 100644
--- a/branches/sca-equinox/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
index 5a14b41650..5a14b41650 100644
--- a/branches/sca-equinox/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
diff --git a/branches/sca-equinox/itest/contribution-import-export/export-resource/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-resource/pom.xml
index d4dadc7dd7..d4dadc7dd7 100644
--- a/branches/sca-equinox/itest/contribution-import-export/export-resource/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-resource/pom.xml
diff --git a/branches/sca-equinox/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
index f11eacb416..f11eacb416 100644
--- a/branches/sca-equinox/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
index 1ff281373a..1ff281373a 100644
--- a/branches/sca-equinox/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
diff --git a/branches/sca-equinox/itest/contribution-import-export/export-wsdl/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-wsdl/pom.xml
index 95611ac2e0..95611ac2e0 100644
--- a/branches/sca-equinox/itest/contribution-import-export/export-wsdl/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-wsdl/pom.xml
diff --git a/branches/sca-equinox/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
index b7394ec14b..b7394ec14b 100644
--- a/branches/sca-equinox/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
index 9b31363e1a..9b31363e1a 100644
--- a/branches/sca-equinox/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
diff --git a/branches/sca-equinox/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
index d3c83b08c6..d3c83b08c6 100644
--- a/branches/sca-equinox/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml
index 95a22971e5..95a22971e5 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
index 966f56d7d5..966f56d7d5 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
index 3d43290380..3d43290380 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
index 74d22ed830..74d22ed830 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
index 9f3f5be452..9f3f5be452 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
index 9b31363e1a..9b31363e1a 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
index d3c83b08c6..d3c83b08c6 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
index e2f852ff7e..e2f852ff7e 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
index 1176a89143..1176a89143 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml
index 2c97d8d9ba..2c97d8d9ba 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
index 224e2c4d79..224e2c4d79 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
index 9b650e4acc..9b650e4acc 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 431988cc04..431988cc04 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml
index b226d11461..b226d11461 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
index ac6d7becb3..ac6d7becb3 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-resource/src/main/resources/store.composite b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-resource/src/main/resources/store.composite
index bb5a7b764f..bb5a7b764f 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-resource/src/main/resources/store.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-resource/src/main/resources/store.composite
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
index 1b7542b7d9..1b7542b7d9 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml
index 12b205cf93..12b205cf93 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
index 3d43290380..3d43290380 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
index 74d22ed830..74d22ed830 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
index d46fe0b57c..d46fe0b57c 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
index 5008a2ea5b..5008a2ea5b 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 5c40606e50..5c40606e50 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/branches/sca-equinox/itest/contribution-import-export/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/pom.xml
index 995aa7b11c..995aa7b11c 100644
--- a/branches/sca-equinox/itest/contribution-import-export/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution-import-export/pom.xml
diff --git a/branches/sca-equinox/itest/contribution/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution/pom.xml
index 4285b21761..4285b21761 100644
--- a/branches/sca-equinox/itest/contribution/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution/pom.xml
diff --git a/branches/sca-equinox/itest/contribution/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/java/calculator/AddService.java
index 4e72f92fda..4e72f92fda 100644
--- a/branches/sca-equinox/itest/contribution/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/itest/contribution/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-equinox/itest/contribution/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/itest/contribution/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/java/calculator/CalculatorClient.java
index 40ca4d9b0f..40ca4d9b0f 100644
--- a/branches/sca-equinox/itest/contribution/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/itest/contribution/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/java/calculator/CalculatorService.java
index f288af0174..f288af0174 100644
--- a/branches/sca-equinox/itest/contribution/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
index ae4ed12b7b..ae4ed12b7b 100644
--- a/branches/sca-equinox/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/itest/contribution/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/java/calculator/DivideService.java
index ad99418f5b..ad99418f5b 100644
--- a/branches/sca-equinox/itest/contribution/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/itest/contribution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-equinox/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/itest/contribution/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/java/calculator/MultiplyService.java
index 3987b0a54f..3987b0a54f 100644
--- a/branches/sca-equinox/itest/contribution/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-equinox/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/itest/contribution/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/java/calculator/SubtractService.java
index 25e0ed6ca7..25e0ed6ca7 100644
--- a/branches/sca-equinox/itest/contribution/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-equinox/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/itest/contribution/src/main/resources/ContributionTest.composite b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/resources/ContributionTest.composite
index d814e439e2..d814e439e2 100644
--- a/branches/sca-equinox/itest/contribution/src/main/resources/ContributionTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/resources/ContributionTest.composite
diff --git a/branches/sca-equinox/itest/contribution/src/main/resources/calculator/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/resources/calculator/Calculator.composite
index 657a2f95d8..657a2f95d8 100644
--- a/branches/sca-equinox/itest/contribution/src/main/resources/calculator/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/resources/calculator/Calculator.composite
diff --git a/branches/sca-equinox/itest/contribution/src/main/resources/calculator/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/resources/calculator/sca-contribution.xml
index e95796d83a..e95796d83a 100644
--- a/branches/sca-equinox/itest/contribution/src/main/resources/calculator/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/main/resources/calculator/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
index 97b2e5d6ed..97b2e5d6ed 100644
--- a/branches/sca-equinox/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
diff --git a/branches/sca-equinox/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-equinox/itest/contribution/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/test/resources/deployables/sample-calculator.jar
diff --git a/branches/sca-equinox/itest/contribution/src/test/resources/repository/sample-calculator.jar b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/test/resources/repository/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-equinox/itest/contribution/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-2.x/branches/sca-equinox/itest/contribution/src/test/resources/repository/sample-calculator.jar
diff --git a/branches/sca-equinox/itest/conversations-ws/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/pom.xml
index 8190380c82..8190380c82 100644
--- a/branches/sca-equinox/itest/conversations-ws/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/pom.xml
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
index 9cd88620e3..9cd88620e3 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
index 53dadc3dc7..53dadc3dc7 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
index cb7a032e85..cb7a032e85 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
index 2532346349..2532346349 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
index 8f008fa711..8f008fa711 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
index 1e36ce6917..1e36ce6917 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
index b4d3fe3d71..b4d3fe3d71 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
index ed3a01c10b..ed3a01c10b 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
index 1603916cca..1603916cca 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
index accc1eee27..accc1eee27 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
index 90f6de86ac..90f6de86ac 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
index 3f7a90b3dc..3f7a90b3dc 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
index ab91498132..ab91498132 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
index e4f83656de..e4f83656de 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
index 8fe7c5b6ba..8fe7c5b6ba 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
index 9f4857f703..9f4857f703 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
index 4b06251414..4b06251414 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
index be039748fc..be039748fc 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
index 42f2f1a603..42f2f1a603 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
index a852aeda56..a852aeda56 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
index d5a1ff7410..d5a1ff7410 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/resources/Conversational/conversational.composite b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
index c4da99145d..c4da99145d 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
index 20a92c9dc7..20a92c9dc7 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
index 73d078674c..73d078674c 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
index 9c6b0a2b34..9c6b0a2b34 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
diff --git a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
index 6c3cbe462c..6c3cbe462c 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
index 051b6b9fc1..051b6b9fc1 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
index b9530c132b..b9530c132b 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
index 1e5f6adcf1..1e5f6adcf1 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
index 8a110477b5..8a110477b5 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
index 79ac9262c6..79ac9262c6 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
diff --git a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
index 9aebae9ced..9aebae9ced 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
diff --git a/branches/sca-equinox/itest/conversations/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/conversations/pom.xml
index 151011bece..151011bece 100644
--- a/branches/sca-equinox/itest/conversations/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/pom.xml
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
index a3b83dfc14..a3b83dfc14 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
index 8e98b9cbd4..8e98b9cbd4 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
index e7583c339a..e7583c339a 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
index bc4a5fc571..bc4a5fc571 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
index 77d7f4c007..77d7f4c007 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
index e422938b27..e422938b27 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
index a6dbf56797..a6dbf56797 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
index 3f04e9f09e..3f04e9f09e 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
index 53dadc3dc7..53dadc3dc7 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
index 8cad88d2f4..8cad88d2f4 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
index 2532346349..2532346349 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
index 8f008fa711..8f008fa711 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
index 546382cfd1..546382cfd1 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
index f1a21cc18f..f1a21cc18f 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
index 74afbfb763..74afbfb763 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
index 5f97b16088..5f97b16088 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
index 3ce3e3ada7..3ce3e3ada7 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
index 95c9c7ae6e..95c9c7ae6e 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
index a5f37f7a52..a5f37f7a52 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
index c1e27641ef..c1e27641ef 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
index 900b8f743f..900b8f743f 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
index b21f956bd9..b21f956bd9 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
index 9deef312ac..9deef312ac 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
index cffa76186a..cffa76186a 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
index 1272c7ab7f..1272c7ab7f 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
index 847b038881..847b038881 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
index b77e4c0194..b77e4c0194 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
index 5b3906fc2c..5b3906fc2c 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
index 8fe7c5b6ba..8fe7c5b6ba 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
index 9a25f0f59a..9a25f0f59a 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
index efcbdff06f..efcbdff06f 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
index 8454b3846b..8454b3846b 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
index 07186c91e1..07186c91e1 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
index 344aa99dff..344aa99dff 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
index 8d79bb75e8..8d79bb75e8 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
index d1b769216b..d1b769216b 100644
--- a/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
diff --git a/branches/sca-equinox/itest/conversations/src/main/resources/ConversationAge.composite b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/resources/ConversationAge.composite
index abd1c35ced..abd1c35ced 100644
--- a/branches/sca-equinox/itest/conversations/src/main/resources/ConversationAge.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/resources/ConversationAge.composite
diff --git a/branches/sca-equinox/itest/conversations/src/main/resources/ConversationUniqueId.composite b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/resources/ConversationUniqueId.composite
index 831449a079..831449a079 100644
--- a/branches/sca-equinox/itest/conversations/src/main/resources/ConversationUniqueId.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/resources/ConversationUniqueId.composite
diff --git a/branches/sca-equinox/itest/conversations/src/main/resources/conversationId.composite b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/resources/conversationId.composite
index e61eb08194..e61eb08194 100644
--- a/branches/sca-equinox/itest/conversations/src/main/resources/conversationId.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/resources/conversationId.composite
diff --git a/branches/sca-equinox/itest/conversations/src/main/resources/conversationLifetime.composite b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/resources/conversationLifetime.composite
index 3b79dc43d9..3b79dc43d9 100644
--- a/branches/sca-equinox/itest/conversations/src/main/resources/conversationLifetime.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/resources/conversationLifetime.composite
diff --git a/branches/sca-equinox/itest/conversations/src/main/resources/conversational.composite b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/resources/conversational.composite
index 4da3ce74d5..4da3ce74d5 100644
--- a/branches/sca-equinox/itest/conversations/src/main/resources/conversational.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/main/resources/conversational.composite
diff --git a/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
index 3e750bdd1e..3e750bdd1e 100644
--- a/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
diff --git a/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
index 326a833a42..326a833a42 100644
--- a/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
diff --git a/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
index 431962221a..431962221a 100644
--- a/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
diff --git a/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
index cc31c77873..cc31c77873 100644
--- a/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
diff --git a/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
index 8480e04028..8480e04028 100644
--- a/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
diff --git a/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
index da359bc296..da359bc296 100644
--- a/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
diff --git a/branches/sca-equinox/itest/corba/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/corba/pom.xml
index 16c504bb87..16c504bb87 100644
--- a/branches/sca-equinox/itest/corba/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/pom.xml
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
index 46e214eac3..46e214eac3 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
index cba8c823e8..cba8c823e8 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
index 0135c04495..0135c04495 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
index b7309d68a0..b7309d68a0 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
index a738c6f211..a738c6f211 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
index 008212bdbe..008212bdbe 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
index bd1ce8cb49..bd1ce8cb49 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
index c25372c837..c25372c837 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
index abcec43d0e..abcec43d0e 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
index 171a7919a2..171a7919a2 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
index 5f2dc56033..5f2dc56033 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
index 24a628d406..24a628d406 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
index da37f28e39..da37f28e39 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
index 7b2466f791..7b2466f791 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
index 27052a1549..27052a1549 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
index 57daa51f42..57daa51f42 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
index 88fef0b4fb..88fef0b4fb 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
index 40c017dd29..40c017dd29 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
index 6ec067521e..6ec067521e 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
index 8955f81694..8955f81694 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
index 940b391499..940b391499 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
index 63a11dc56a..63a11dc56a 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
index 8c0bfc9e39..8c0bfc9e39 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
index 72ff55a711..72ff55a711 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
index 8a063b8b9d..8a063b8b9d 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
index 4a3376c476..4a3376c476 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
index 9b89d7f98a..9b89d7f98a 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
index 3c1a1c9a83..3c1a1c9a83 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
index 13f294b871..13f294b871 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
index 66cc1d1e82..66cc1d1e82 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
index f14394b400..f14394b400 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
index 56388624d7..56388624d7 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
index 1897d0682c..1897d0682c 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
index c8c88ef91d..c8c88ef91d 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
index 5540b98c21..5540b98c21 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
index 648144299c..648144299c 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
index b57e098a56..b57e098a56 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
index 8ddfa10575..8ddfa10575 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
index 9717629711..9717629711 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
index 1247b4618d..1247b4618d 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
index f2cc3adad5..f2cc3adad5 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
index dbad550222..dbad550222 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
index d29129236c..d29129236c 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
index 837ba04cea..837ba04cea 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
index 0b24056642..0b24056642 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
index e2ed1ab037..e2ed1ab037 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
index 46888399ed..46888399ed 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
index c276038050..c276038050 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
index 079a56b446..079a56b446 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
index 0407184598..0407184598 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
index 16e099cfa3..16e099cfa3 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
index b4883cb35c..b4883cb35c 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
index c96fb61204..c96fb61204 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
index 3427c127ec..3427c127ec 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
index 78464fe40d..78464fe40d 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
index faff36c2a4..faff36c2a4 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
index 750006cec6..750006cec6 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
index ef9f561d1b..ef9f561d1b 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
index 4f6eacc9ff..4f6eacc9ff 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
index a3be6daa23..a3be6daa23 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
index dc752a2aea..dc752a2aea 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
index aec0f7b1bf..aec0f7b1bf 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
index 04aef326af..04aef326af 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
index bc76373633..bc76373633 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
index 2f10177bd0..2f10177bd0 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
index de8624455f..de8624455f 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
index 30e4e2994a..30e4e2994a 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
index 9b49adbfbb..9b49adbfbb 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
index 7889a80bf1..7889a80bf1 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
index cdd49904d3..cdd49904d3 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
index 6f0ef584da..6f0ef584da 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
index 71003d008f..71003d008f 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
index 271f1e669b..271f1e669b 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
index f2baffce9a..f2baffce9a 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
index 1b44da9752..1b44da9752 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
index 8270ba1a8c..8270ba1a8c 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
index 922759cd8d..922759cd8d 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
index a4f15488cd..a4f15488cd 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
index 47f0775c16..47f0775c16 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
index 0e894cb7ea..0e894cb7ea 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
index 7d43badb23..7d43badb23 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
index 8e76958e31..8e76958e31 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
index 1e4264256b..1e4264256b 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
index 917cceedf5..917cceedf5 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
index b679214c6c..b679214c6c 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
index 415634c80f..415634c80f 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
index d7c72b40da..d7c72b40da 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
index cb868d18a0..cb868d18a0 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
diff --git a/branches/sca-equinox/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 3e77527d73..3e77527d73 100644
--- a/branches/sca-equinox/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-equinox/itest/corba/src/test/resources/ScenarioFive.composite b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/resources/ScenarioFive.composite
index 3c73e238a5..3c73e238a5 100644
--- a/branches/sca-equinox/itest/corba/src/test/resources/ScenarioFive.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/resources/ScenarioFive.composite
diff --git a/branches/sca-equinox/itest/corba/src/test/resources/ScenarioFour.composite b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/resources/ScenarioFour.composite
index 01d7e2314a..01d7e2314a 100644
--- a/branches/sca-equinox/itest/corba/src/test/resources/ScenarioFour.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/resources/ScenarioFour.composite
diff --git a/branches/sca-equinox/itest/corba/src/test/resources/ScenarioOne.composite b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/resources/ScenarioOne.composite
index c10b383661..c10b383661 100644
--- a/branches/sca-equinox/itest/corba/src/test/resources/ScenarioOne.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/resources/ScenarioOne.composite
diff --git a/branches/sca-equinox/itest/corba/src/test/resources/ScenarioSix.composite b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/resources/ScenarioSix.composite
index 88238478c1..88238478c1 100644
--- a/branches/sca-equinox/itest/corba/src/test/resources/ScenarioSix.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/resources/ScenarioSix.composite
diff --git a/branches/sca-equinox/itest/corba/src/test/resources/ScenarioThree.composite b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/resources/ScenarioThree.composite
index f43e4a3f7a..f43e4a3f7a 100644
--- a/branches/sca-equinox/itest/corba/src/test/resources/ScenarioThree.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/resources/ScenarioThree.composite
diff --git a/branches/sca-equinox/itest/corba/src/test/resources/ScenarioTwo.composite b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/resources/ScenarioTwo.composite
index dc5ddc50d3..dc5ddc50d3 100644
--- a/branches/sca-equinox/itest/corba/src/test/resources/ScenarioTwo.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/resources/ScenarioTwo.composite
diff --git a/branches/sca-equinox/itest/corba/src/test/resources/itest_scenario.idl b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/resources/itest_scenario.idl
index 41489a4565..41489a4565 100644
--- a/branches/sca-equinox/itest/corba/src/test/resources/itest_scenario.idl
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/resources/itest_scenario.idl
diff --git a/branches/sca-equinox/itest/corba/src/test/resources/scenariofour.xsd b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/resources/scenariofour.xsd
index 2669b54be3..2669b54be3 100644
--- a/branches/sca-equinox/itest/corba/src/test/resources/scenariofour.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/corba/src/test/resources/scenariofour.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/pom.xml
index aae85e39fe..aae85e39fe 100644
--- a/branches/sca-equinox/itest/databindings/common/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/pom.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
index adb546a1ea..adb546a1ea 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
index b2346aa973..b2346aa973 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
index 88616cc997..88616cc997 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
index 77a12e92ec..77a12e92ec 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
index ee73db6152..ee73db6152 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
index aab564dc1e..aab564dc1e 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
index 5507a0b747..5507a0b747 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/generate.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/generate.xsd
index 1fabedf55f..1fabedf55f 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/generate.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/generate/generate.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/wsdl/Dummy.txt b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
index 8927d725b6..8927d725b6 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Annotation.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Annotation.xml
index f1f4346e58..f1f4346e58 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Annotation.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Annotation.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Annotation.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
index 1fae43eb09..1fae43eb09 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Attribute.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Attribute.xml
index c20c80b658..c20c80b658 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Attribute.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Attribute.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Attribute.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
index bd3db2e030..bd3db2e030 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
index 30e4979dca..30e4979dca 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
index e7738dcff7..e7738dcff7 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
index 9552421e2d..9552421e2d 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
index c7b9655749..c7b9655749 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
index 5e5e7fbd55..5e5e7fbd55 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
index 5c455c2ab5..5c455c2ab5 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
index 635e851632..635e851632 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
index 004dab4fbb..004dab4fbb 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
index 136092951b..136092951b 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
index 796f08e1cf..796f08e1cf 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
index 927b94885c..927b94885c 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
index 93f83cd0a1..93f83cd0a1 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
index ea7db70595..ea7db70595 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
index c64323e7e1..c64323e7e1 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
index 85c7d85fd4..85c7d85fd4 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
index 543f276c50..543f276c50 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
index fcd281539b..fcd281539b 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
index 1610c2b861..1610c2b861 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
index 36a0760a61..36a0760a61 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
index 999b72bb35..999b72bb35 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
index 5849165fe0..5849165fe0 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
index 71dad561ca..71dad561ca 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
index 8acf9376d7..8acf9376d7 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
index a49987c352..a49987c352 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
index a35b6e174a..a35b6e174a 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
index e1995890f9..e1995890f9 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
index 91cfce51b8..91cfce51b8 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
index a2f86ba8c5..a2f86ba8c5 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
index 907474cd1b..907474cd1b 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
index a2f6bcfa77..a2f6bcfa77 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
index c5820e1a2e..c5820e1a2e 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
index f4d596bfe3..f4d596bfe3 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
index 0debe2fec5..0debe2fec5 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
index b5bcfdcfd4..b5bcfdcfd4 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
index 7f001254cc..7f001254cc 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
index 8d4d106f59..8d4d106f59 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
index f875b9f94d..f875b9f94d 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
index 4c8a39b06c..4c8a39b06c 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
index 7d343d6dda..7d343d6dda 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
index bb12bc04a9..bb12bc04a9 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
index 7a81f3b0dd..7a81f3b0dd 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
index f0e1c21233..f0e1c21233 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
index d35568b3c9..d35568b3c9 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
index 92bd9a4b66..92bd9a4b66 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
index 52cdfa8c4e..52cdfa8c4e 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
index 78d001a585..78d001a585 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
index 2609a858f7..2609a858f7 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
index 38f6c55059..38f6c55059 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
index 7868a47ca3..7868a47ca3 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
index 0d65b124ff..0d65b124ff 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
index 3f5080d49f..3f5080d49f 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
index 340555dc5f..340555dc5f 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
index 0deb7af980..0deb7af980 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
index 8059fe6da0..8059fe6da0 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
index 06c92ce19b..06c92ce19b 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
index 7b1f02d1d4..7b1f02d1d4 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
index 9bc0cefd0f..9bc0cefd0f 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
index 0c207983bc..0c207983bc 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
index f91b602f99..f91b602f99 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
index b99bf01b73..b99bf01b73 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
index c99698e175..c99698e175 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
index b5b9b0d1eb..b5b9b0d1eb 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
index 80d22ce057..80d22ce057 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
index 4902935db5..4902935db5 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
index 664bf824b4..664bf824b4 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
index 5d3658d224..5d3658d224 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
index c5861fa92a..c5861fa92a 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
index 0aa4710057..0aa4710057 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
index 1f95950394..1f95950394 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
index 6ee9c435db..6ee9c435db 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
index 0297f1aeb4..0297f1aeb4 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
index 56d027bdbb..56d027bdbb 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
index 81ba1069bd..81ba1069bd 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
index 866ab73024..866ab73024 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
index 8bb3a08b94..8bb3a08b94 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
index c7c62f812b..c7c62f812b 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
index 8235718c5e..8235718c5e 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
index 36caba2f16..36caba2f16 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
index 599c428a44..599c428a44 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
index 389d5a99f0..389d5a99f0 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
index 919c4a20ee..919c4a20ee 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
index 59887078b5..59887078b5 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
index 79011f26ab..79011f26ab 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
index 5de7d64d7b..5de7d64d7b 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
index c40be9e18b..c40be9e18b 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
index d4a78787b8..d4a78787b8 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
index c30434de66..c30434de66 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
index 5381590cd1..5381590cd1 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
index 4cd6ea7e72..4cd6ea7e72 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
index e8faf6225b..e8faf6225b 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
index b4375467c4..b4375467c4 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
index a4f564d9b7..a4f564d9b7 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
index d30ab85530..d30ab85530 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
index 8abb34b5a5..8abb34b5a5 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
index 7fd9a061ae..7fd9a061ae 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
index 1615976813..1615976813 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
index cd567ba528..cd567ba528 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
index 0beaac571f..0beaac571f 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
index 025362defb..025362defb 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
index d6d951fe5d..d6d951fe5d 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
index 5736a8c121..5736a8c121 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
index 242be1d53b..242be1d53b 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
index d728115a77..d728115a77 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
index 108e3a8619..108e3a8619 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
index d4ffae5e17..d4ffae5e17 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
index 5ee5e0229e..5ee5e0229e 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
index 3d5aed5aa8..3d5aed5aa8 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
index e7b80ab11c..e7b80ab11c 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
index 2b4fe5594e..2b4fe5594e 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
index fc4deb63c2..fc4deb63c2 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
index 03570f41d9..03570f41d9 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
index c754502645..c754502645 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
index 4603793bfc..4603793bfc 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
index 4bcd2f8c46..4bcd2f8c46 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
index a6861f803a..a6861f803a 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
index 8bb251cab2..8bb251cab2 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
index 467ec007ed..467ec007ed 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
index 8d00646678..8d00646678 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
index 7deafd798a..7deafd798a 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
index 72ac75fee0..72ac75fee0 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
index f6208f81b3..f6208f81b3 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
index 1f26e13673..1f26e13673 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
index 97de7b98eb..97de7b98eb 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
index 67716553d8..67716553d8 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
index 5941348921..5941348921 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
index 24d5d09054..24d5d09054 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
index f684d06a4d..f684d06a4d 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
index de4a8a666d..de4a8a666d 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
index 242908bd27..242908bd27 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
index 4c00fbe295..4c00fbe295 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
index 925e8625d5..925e8625d5 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
index b12bec040b..b12bec040b 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
index c73708ce46..c73708ce46 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
index 795c3ea7d9..795c3ea7d9 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
index 3ebdc89ae0..3ebdc89ae0 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
index 21546d0f67..21546d0f67 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
index 89657e42ca..89657e42ca 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
index d01b4172e4..d01b4172e4 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
index 82fd1eedaf..82fd1eedaf 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
index e1dcf06194..e1dcf06194 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
index ebf03c9d5d..ebf03c9d5d 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
index 8b9ba5b4b8..8b9ba5b4b8 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
index 26466b1b39..26466b1b39 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
index ff418c56ab..ff418c56ab 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
index 27bb1ce9cc..27bb1ce9cc 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
index 2bf1df8c99..2bf1df8c99 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
index 9b5561ed43..9b5561ed43 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
index 0b4e7bdf45..0b4e7bdf45 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
index f1b7cd264c..f1b7cd264c 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
index a2c8456257..a2c8456257 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
index 1f60b0423f..1f60b0423f 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
index 21e55ab8c1..21e55ab8c1 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
index 30762f4912..30762f4912 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
index 5bf35d0d70..5bf35d0d70 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
index 2dd01e4090..2dd01e4090 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
index 6920cd8dd0..6920cd8dd0 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
index 6a526bdc47..6a526bdc47 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
index 1117a95eb8..1117a95eb8 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
index ab91458bff..ab91458bff 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
index 3e015843b5..3e015843b5 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
index b6d68fd08a..b6d68fd08a 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
index d4453a4477..d4453a4477 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
index 6de3adc937..6de3adc937 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
index 786ab226da..786ab226da 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
index 64093aa803..64093aa803 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
index 01f4c2b1ef..01f4c2b1ef 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
index 774646f682..774646f682 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
index 34da37564c..34da37564c 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
index a1fb3aa803..a1fb3aa803 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
index 8eb7a4fce4..8eb7a4fce4 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
index f68eb1939d..f68eb1939d 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
index b9f77e6658..b9f77e6658 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Import.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Import.xml
index fd28850050..fd28850050 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Import.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Import.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Import.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Import.xsd
index eae93fd44a..eae93fd44a 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Import.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Import.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
index a7e568decf..a7e568decf 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Include.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Include.xml
index d4b9e24fa6..d4b9e24fa6 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Include.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Include.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Include.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Include.xsd
index 34ff314a19..34ff314a19 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Include.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Include.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Interop.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Interop.xsd
index ae22ab2c44..ae22ab2c44 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Interop.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Interop.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Notation.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Notation.xml
index b75ac6500a..b75ac6500a 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Notation.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Notation.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Notation.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Notation.xsd
index 6ad019cb81..6ad019cb81 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Notation.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Notation.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Person.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Person.xsd
index 5f5021b15e..5f5021b15e 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Person.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/Person.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
index 6c5ad88ff4..6c5ad88ff4 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
index 6b7e39b334..6b7e39b334 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
index f9d4a24a49..f9d4a24a49 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
index f649e2ba83..f649e2ba83 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
index 410df4b7e4..410df4b7e4 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
index 5d27ef5ce1..5d27ef5ce1 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
index 7b74867c03..7b74867c03 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
index ec16a678a3..ec16a678a3 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
index 708d526f44..708d526f44 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
index ed681009f9..ed681009f9 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
index e404ac86b7..e404ac86b7 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
index af0431f048..af0431f048 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
index c86a0f6bcb..c86a0f6bcb 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
index 89b00a36cc..89b00a36cc 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
index 399b0d8175..399b0d8175 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
index ea35bec61a..ea35bec61a 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
index bc8cf35368..bc8cf35368 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
index 57981e3666..57981e3666 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
index da2929776e..da2929776e 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
index ace5427786..ace5427786 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/datagraph.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
index e6b9697a8d..e6b9697a8d 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
index 7387568942..7387568942 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
index c5aabc9cc8..c5aabc9cc8 100644
--- a/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
diff --git a/branches/sca-equinox/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
index fa3f310d4d..fa3f310d4d 100644
--- a/branches/sca-equinox/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
diff --git a/branches/sca-equinox/itest/databindings/config.png b/sca-java-2.x/branches/sca-equinox/itest/databindings/config.png
index 7912019e9d..7912019e9d 100644
--- a/branches/sca-equinox/itest/databindings/config.png
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/config.png
diff --git a/branches/sca-equinox/itest/databindings/config.svg b/sca-java-2.x/branches/sca-equinox/itest/databindings/config.svg
index aaf027e2df..aaf027e2df 100644
--- a/branches/sca-equinox/itest/databindings/config.svg
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/config.svg
diff --git a/branches/sca-equinox/itest/databindings/databinding.png b/sca-java-2.x/branches/sca-equinox/itest/databindings/databinding.png
index 76a9c71b7d..76a9c71b7d 100644
--- a/branches/sca-equinox/itest/databindings/databinding.png
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/databinding.png
diff --git a/branches/sca-equinox/itest/databindings/databinding.svg b/sca-java-2.x/branches/sca-equinox/itest/databindings/databinding.svg
index d6850ccf7d..d6850ccf7d 100644
--- a/branches/sca-equinox/itest/databindings/databinding.svg
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/databinding.svg
diff --git a/branches/sca-equinox/itest/databindings/interop.png b/sca-java-2.x/branches/sca-equinox/itest/databindings/interop.png
index 005e0f24ea..005e0f24ea 100644
--- a/branches/sca-equinox/itest/databindings/interop.png
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/interop.png
diff --git a/branches/sca-equinox/itest/databindings/interop.svg b/sca-java-2.x/branches/sca-equinox/itest/databindings/interop.svg
index 03897c6d09..03897c6d09 100644
--- a/branches/sca-equinox/itest/databindings/interop.svg
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/interop.svg
diff --git a/branches/sca-equinox/itest/databindings/interop/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/interop/pom.xml
index 18108a16d4..18108a16d4 100644
--- a/branches/sca-equinox/itest/databindings/interop/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/interop/pom.xml
diff --git a/branches/sca-equinox/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm b/sca-java-2.x/branches/sca-equinox/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
index 7bdfc57924..7bdfc57924 100644
--- a/branches/sca-equinox/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
diff --git a/branches/sca-equinox/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm b/sca-java-2.x/branches/sca-equinox/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
index 38bfccce0c..38bfccce0c 100644
--- a/branches/sca-equinox/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
diff --git a/branches/sca-equinox/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm b/sca-java-2.x/branches/sca-equinox/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
index 6f02af4c9d..6f02af4c9d 100644
--- a/branches/sca-equinox/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
diff --git a/branches/sca-equinox/itest/databindings/interop/src/main/resources/generate/generate.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/interop/src/main/resources/generate/generate.xml
index 8453dd56b4..8453dd56b4 100644
--- a/branches/sca-equinox/itest/databindings/interop/src/main/resources/generate/generate.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/interop/src/main/resources/generate/generate.xml
diff --git a/branches/sca-equinox/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm b/sca-java-2.x/branches/sca-equinox/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
index 36797fde57..36797fde57 100644
--- a/branches/sca-equinox/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/pom.xml
index 4aef30dad5..4aef30dad5 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/pom.xml
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
index 7f9b62f9b4..7f9b62f9b4 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
index 1762812c1f..1762812c1f 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
index 7529c2b841..7529c2b841 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
index 4a4419a42b..4a4419a42b 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
index 65f019ec48..65f019ec48 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
index 844e28863a..844e28863a 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
index 4e0bd38b2b..4e0bd38b2b 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
index 40aff31297..40aff31297 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
index ca012b967d..ca012b967d 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
index 12ed7d0ec7..12ed7d0ec7 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
index 3bae554dc7..3bae554dc7 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
index a31cc3d45a..a31cc3d45a 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
index 34ac9024f6..34ac9024f6 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
index 23ed57dec9..23ed57dec9 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
index 6239c0f5f1..6239c0f5f1 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
index c5553688e2..c5553688e2 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
index 3bdf886dfa..3bdf886dfa 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
index 0fdf69459f..0fdf69459f 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
index 2842205085..2842205085 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
index 351d9df0cb..351d9df0cb 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
index 8b484e93f0..8b484e93f0 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
index 4a35d41c04..4a35d41c04 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
index 9e042ffe6a..9e042ffe6a 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
index ec929ddece..ec929ddece 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
index 58808eec4f..58808eec4f 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
index 858b8da59a..858b8da59a 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
index 51e48edbc9..51e48edbc9 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
index de52cdfac3..de52cdfac3 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
index 199335c38c..199335c38c 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
index fe9121be9d..fe9121be9d 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
index 28ace6aab7..28ace6aab7 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
index ab1a3b4ab8..ab1a3b4ab8 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
index 0a8f6772b5..0a8f6772b5 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
index 626b0e9844..626b0e9844 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
index 19a6cae01b..19a6cae01b 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
index 68510b4b03..68510b4b03 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
index 10a242be4d..10a242be4d 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
index 5ecbb9edee..5ecbb9edee 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
index 2d47ba7b14..2d47ba7b14 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
index c39cf21002..c39cf21002 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
index 4b0a6e215d..4b0a6e215d 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
index 13ef73c082..13ef73c082 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
index 4967b896a5..4967b896a5 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
index 744bf20494..744bf20494 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
index c22d00140e..c22d00140e 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
index f8aaad3dac..f8aaad3dac 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
index c71a5875f4..c71a5875f4 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/pom.xml
index 10f0e4db89..10f0e4db89 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/pom.xml
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
index 352f805c7d..352f805c7d 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
index 7bd95cec95..7bd95cec95 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
index 8c0fb24da9..8c0fb24da9 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
index 3a5a81bae4..3a5a81bae4 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
index 4be057fe68..4be057fe68 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
index 0c073cd054..0c073cd054 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
index c4026fdb9a..c4026fdb9a 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
index fc2dc64b7d..fc2dc64b7d 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
index ef1a907b29..ef1a907b29 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
index e60ae41767..e60ae41767 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
index 8803eb262a..8803eb262a 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
index 46569311ff..46569311ff 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
index 9d851455da..9d851455da 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
index 926e4154aa..926e4154aa 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
index 63151f6a2d..63151f6a2d 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
index f366783e5e..f366783e5e 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
index 85ca6d0789..85ca6d0789 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
index 4788df78e0..4788df78e0 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
index 5bfd1ea277..5bfd1ea277 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
index 5c82fe121f..5c82fe121f 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
index 4a292a8b7a..4a292a8b7a 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
index 402ade0852..402ade0852 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
diff --git a/branches/sca-equinox/itest/databindings/jaxbgen/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxbgen/pom.xml
index 2aa8eec03e..2aa8eec03e 100644
--- a/branches/sca-equinox/itest/databindings/jaxbgen/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxbgen/pom.xml
diff --git a/branches/sca-equinox/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
index 8381a164ea..8381a164ea 100644
--- a/branches/sca-equinox/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
diff --git a/branches/sca-equinox/itest/databindings/jaxbgen/src/main/resources/greeter.composite b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxbgen/src/main/resources/greeter.composite
index ae0740e6fe..ae0740e6fe 100644
--- a/branches/sca-equinox/itest/databindings/jaxbgen/src/main/resources/greeter.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/jaxbgen/src/main/resources/greeter.composite
diff --git a/branches/sca-equinox/itest/databindings/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/pom.xml
index fa74d1962d..fa74d1962d 100644
--- a/branches/sca-equinox/itest/databindings/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/pom.xml
diff --git a/branches/sca-equinox/itest/databindings/readme.html b/sca-java-2.x/branches/sca-equinox/itest/databindings/readme.html
index 24a44e4ed7..24a44e4ed7 100644
--- a/branches/sca-equinox/itest/databindings/readme.html
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/readme.html
diff --git a/branches/sca-equinox/itest/databindings/sdogen/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/sdogen/pom.xml
index 01e38cc1c1..01e38cc1c1 100644
--- a/branches/sca-equinox/itest/databindings/sdogen/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/sdogen/pom.xml
diff --git a/branches/sca-equinox/itest/databindings/sdogen/src/main/resources/generate/generate.xml b/sca-java-2.x/branches/sca-equinox/itest/databindings/sdogen/src/main/resources/generate/generate.xml
index 3f9926604d..3f9926604d 100644
--- a/branches/sca-equinox/itest/databindings/sdogen/src/main/resources/generate/generate.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/sdogen/src/main/resources/generate/generate.xml
diff --git a/branches/sca-equinox/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm b/sca-java-2.x/branches/sca-equinox/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
index 9494d70f96..9494d70f96 100644
--- a/branches/sca-equinox/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
+++ b/sca-java-2.x/branches/sca-equinox/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding-ws/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/pom.xml
index 45cbab9404..45cbab9404 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding-ws/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/pom.xml
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
index 4f4fe50041..4f4fe50041 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
index 95496e1737..95496e1737 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
index 842dd4e602..842dd4e602 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
index 74815dc6c1..74815dc6c1 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
index aba83723bb..aba83723bb 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
index ab65efbb58..ab65efbb58 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
index acecdff613..acecdff613 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
index 460edab182..460edab182 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
index 40e87953b6..40e87953b6 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
index 9759647cfe..9759647cfe 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
index fc49fa1d7d..fc49fa1d7d 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/pom.xml
index 41d599b179..41d599b179 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/pom.xml
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
index f5e36db7cd..f5e36db7cd 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
index 65751175fb..65751175fb 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
index 5f65d293ea..5f65d293ea 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
index e84ae633e7..e84ae633e7 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
index 74815dc6c1..74815dc6c1 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
index 5fe40935ec..5fe40935ec 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
index ab65efbb58..ab65efbb58 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
index 872fd721d1..872fd721d1 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
index 83526cb6a1..83526cb6a1 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
index d70cdad313..d70cdad313 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
index 33b830c856..33b830c856 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
index 9759647cfe..9759647cfe 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
index 3371f63e4a..3371f63e4a 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
diff --git a/branches/sca-equinox/itest/exceptions-simple-ws/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/pom.xml
index 8f2def2b6a..8f2def2b6a 100644
--- a/branches/sca-equinox/itest/exceptions-simple-ws/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/pom.xml
diff --git a/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
index 764f31b7cd..764f31b7cd 100644
--- a/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
diff --git a/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java
index 1b597984e5..1b597984e5 100644
--- a/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java
diff --git a/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
index 0c72b52ed9..0c72b52ed9 100644
--- a/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
diff --git a/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
index d6545b5a23..d6545b5a23 100644
--- a/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
diff --git a/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java
index 987d2107b5..987d2107b5 100644
--- a/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java
diff --git a/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
index 30ea559694..30ea559694 100644
--- a/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
diff --git a/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
index b3b6f033e5..b3b6f033e5 100644
--- a/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
diff --git a/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java
index aa8591872e..aa8591872e 100644
--- a/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java
diff --git a/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java
index 728be51428..728be51428 100644
--- a/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java
diff --git a/branches/sca-equinox/itest/exceptions-simple-ws/src/main/resources/example.composite b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/main/resources/example.composite
index 505132277c..505132277c 100644
--- a/branches/sca-equinox/itest/exceptions-simple-ws/src/main/resources/example.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/main/resources/example.composite
diff --git a/branches/sca-equinox/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
index 628e6ca6ba..628e6ca6ba 100644
--- a/branches/sca-equinox/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
diff --git a/branches/sca-equinox/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java
index 7310a0f1e7..7310a0f1e7 100644
--- a/branches/sca-equinox/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java
diff --git a/branches/sca-equinox/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
index 740af4f43d..740af4f43d 100644
--- a/branches/sca-equinox/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
diff --git a/branches/sca-equinox/itest/exceptions/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/exceptions/pom.xml
index 7536c0f4b5..7536c0f4b5 100644
--- a/branches/sca-equinox/itest/exceptions/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions/pom.xml
diff --git a/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
index b95b0ccb31..b95b0ccb31 100644
--- a/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
diff --git a/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
index 5740e053a9..5740e053a9 100644
--- a/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
diff --git a/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
index f923133ee9..f923133ee9 100644
--- a/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
diff --git a/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
index 55d81102d2..55d81102d2 100644
--- a/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
diff --git a/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
index 453528444d..453528444d 100644
--- a/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
diff --git a/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
index 1987490a0a..1987490a0a 100644
--- a/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
diff --git a/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
index c4cb52f94c..c4cb52f94c 100644
--- a/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
diff --git a/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
index cf8740ba56..cf8740ba56 100644
--- a/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
diff --git a/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
index f82a30d529..f82a30d529 100644
--- a/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
diff --git a/branches/sca-equinox/itest/exceptions/src/main/resources/ExceptionTest.composite b/sca-java-2.x/branches/sca-equinox/itest/exceptions/src/main/resources/ExceptionTest.composite
index d27797c2fe..d27797c2fe 100644
--- a/branches/sca-equinox/itest/exceptions/src/main/resources/ExceptionTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions/src/main/resources/ExceptionTest.composite
diff --git a/branches/sca-equinox/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
index f84205c096..f84205c096 100644
--- a/branches/sca-equinox/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
diff --git a/branches/sca-equinox/itest/extended-api/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/extended-api/pom.xml
index 2961c33181..2961c33181 100644
--- a/branches/sca-equinox/itest/extended-api/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/extended-api/pom.xml
diff --git a/branches/sca-equinox/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java b/sca-java-2.x/branches/sca-equinox/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
index 869565af17..869565af17 100644
--- a/branches/sca-equinox/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
diff --git a/branches/sca-equinox/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java b/sca-java-2.x/branches/sca-equinox/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
index c54af93c05..c54af93c05 100644
--- a/branches/sca-equinox/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
diff --git a/branches/sca-equinox/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
index 523d238f2e..523d238f2e 100644
--- a/branches/sca-equinox/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
diff --git a/branches/sca-equinox/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
index ab4300a7dd..ab4300a7dd 100644
--- a/branches/sca-equinox/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
diff --git a/branches/sca-equinox/itest/extended-api/src/main/resources/BasicService.composite b/sca-java-2.x/branches/sca-equinox/itest/extended-api/src/main/resources/BasicService.composite
index 128b33b16f..128b33b16f 100644
--- a/branches/sca-equinox/itest/extended-api/src/main/resources/BasicService.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/extended-api/src/main/resources/BasicService.composite
diff --git a/branches/sca-equinox/itest/extended-api/src/main/resources/MathService.composite b/sca-java-2.x/branches/sca-equinox/itest/extended-api/src/main/resources/MathService.composite
index 8e99d3da60..8e99d3da60 100644
--- a/branches/sca-equinox/itest/extended-api/src/main/resources/MathService.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/extended-api/src/main/resources/MathService.composite
diff --git a/branches/sca-equinox/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
index c480235d88..c480235d88 100644
--- a/branches/sca-equinox/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
diff --git a/branches/sca-equinox/itest/interfaces/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/interfaces/pom.xml
index 6cf764f958..6cf764f958 100644
--- a/branches/sca-equinox/itest/interfaces/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/interfaces/pom.xml
diff --git a/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
index 5bc872ef83..5bc872ef83 100644
--- a/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
diff --git a/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
index 7bfcf5de11..7bfcf5de11 100644
--- a/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
diff --git a/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
index d4f7694e8f..d4f7694e8f 100644
--- a/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
diff --git a/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
index 4772303fab..4772303fab 100644
--- a/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
diff --git a/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
index e100636b23..e100636b23 100644
--- a/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
diff --git a/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
index 0bc8d10904..0bc8d10904 100644
--- a/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
diff --git a/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
index e2b70313ed..e2b70313ed 100644
--- a/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
diff --git a/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
index dd591eabeb..dd591eabeb 100644
--- a/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
diff --git a/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
index d4731f35d3..d4731f35d3 100644
--- a/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
diff --git a/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
index 6c40db0e70..6c40db0e70 100644
--- a/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
diff --git a/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
index 3804d31902..3804d31902 100644
--- a/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
diff --git a/branches/sca-equinox/itest/interfaces/src/main/resources/InterfacesTest.composite b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/resources/InterfacesTest.composite
index 0361d8c83c..0361d8c83c 100644
--- a/branches/sca-equinox/itest/interfaces/src/main/resources/InterfacesTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/main/resources/InterfacesTest.composite
diff --git a/branches/sca-equinox/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
index 013cdd4f15..013cdd4f15 100644
--- a/branches/sca-equinox/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
diff --git a/branches/sca-equinox/itest/interop-soap-client/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-client/pom.xml
index c9d304be3b..c9d304be3b 100644
--- a/branches/sca-equinox/itest/interop-soap-client/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-client/pom.xml
diff --git a/branches/sca-equinox/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
index ffffb96686..ffffb96686 100644
--- a/branches/sca-equinox/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
diff --git a/branches/sca-equinox/itest/interop-soap-client/src/main/resources/default.composite b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-client/src/main/resources/default.composite
index 7fd5cc0d65..7fd5cc0d65 100644
--- a/branches/sca-equinox/itest/interop-soap-client/src/main/resources/default.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-client/src/main/resources/default.composite
diff --git a/branches/sca-equinox/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
index 90d8a754b4..90d8a754b4 100644
--- a/branches/sca-equinox/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
diff --git a/branches/sca-equinox/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
index dc1ba48580..dc1ba48580 100644
--- a/branches/sca-equinox/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
diff --git a/branches/sca-equinox/itest/interop-soap-round2-client/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-round2-client/pom.xml
index 639a3edc8c..639a3edc8c 100644
--- a/branches/sca-equinox/itest/interop-soap-round2-client/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-round2-client/pom.xml
diff --git a/branches/sca-equinox/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
index ca3031c646..ca3031c646 100644
--- a/branches/sca-equinox/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
diff --git a/branches/sca-equinox/itest/interop-soap-round2-client/src/main/resources/default.composite b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-round2-client/src/main/resources/default.composite
index 9bde77ef37..9bde77ef37 100644
--- a/branches/sca-equinox/itest/interop-soap-round2-client/src/main/resources/default.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-round2-client/src/main/resources/default.composite
diff --git a/branches/sca-equinox/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
index e08039cedb..e08039cedb 100644
--- a/branches/sca-equinox/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
diff --git a/branches/sca-equinox/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
index bb379c89cd..bb379c89cd 100644
--- a/branches/sca-equinox/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
diff --git a/branches/sca-equinox/itest/interop-soap-service/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-service/pom.xml
index a3a50d55ab..a3a50d55ab 100644
--- a/branches/sca-equinox/itest/interop-soap-service/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-service/pom.xml
diff --git a/branches/sca-equinox/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
index c34941f43e..c34941f43e 100644
--- a/branches/sca-equinox/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
diff --git a/branches/sca-equinox/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
index 820c26ca34..820c26ca34 100644
--- a/branches/sca-equinox/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
diff --git a/branches/sca-equinox/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
index 3fbc73616e..3fbc73616e 100644
--- a/branches/sca-equinox/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
diff --git a/branches/sca-equinox/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
index 8cf95fb789..8cf95fb789 100644
--- a/branches/sca-equinox/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/itest/interop-soap-service/t.bat b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-service/t.bat
index 0f83dedc37..0f83dedc37 100755
--- a/branches/sca-equinox/itest/interop-soap-service/t.bat
+++ b/sca-java-2.x/branches/sca-equinox/itest/interop-soap-service/t.bat
diff --git a/branches/sca-equinox/itest/jms-args/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/jms-args/pom.xml
index f84b2818e9..f84b2818e9 100644
--- a/branches/sca-equinox/itest/jms-args/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-args/pom.xml
diff --git a/branches/sca-equinox/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 51ce5f4f24..51ce5f4f24 100644
--- a/branches/sca-equinox/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/branches/sca-equinox/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/sca-java-2.x/branches/sca-equinox/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
index 487e5f2cbb..487e5f2cbb 100644
--- a/branches/sca-equinox/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
diff --git a/branches/sca-equinox/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
index 18324d5d1d..18324d5d1d 100644
--- a/branches/sca-equinox/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
diff --git a/branches/sca-equinox/itest/jms-args/src/main/resources/jndi.properties b/sca-java-2.x/branches/sca-equinox/itest/jms-args/src/main/resources/jndi.properties
index bb431a592b..bb431a592b 100644
--- a/branches/sca-equinox/itest/jms-args/src/main/resources/jndi.properties
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-args/src/main/resources/jndi.properties
diff --git a/branches/sca-equinox/itest/jms-args/src/main/resources/selectors/selectors.composite b/sca-java-2.x/branches/sca-equinox/itest/jms-args/src/main/resources/selectors/selectors.composite
index 74c352934f..74c352934f 100644
--- a/branches/sca-equinox/itest/jms-args/src/main/resources/selectors/selectors.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-args/src/main/resources/selectors/selectors.composite
diff --git a/branches/sca-equinox/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
index 228366d596..228366d596 100644
--- a/branches/sca-equinox/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
diff --git a/branches/sca-equinox/itest/jms-callbacks/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/jms-callbacks/pom.xml
index 894a3d2584..894a3d2584 100644
--- a/branches/sca-equinox/itest/jms-callbacks/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-callbacks/pom.xml
diff --git a/branches/sca-equinox/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/branches/sca-equinox/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/branches/sca-equinox/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/branches/sca-equinox/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
index 9d75685a8a..9d75685a8a 100644
--- a/branches/sca-equinox/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
diff --git a/branches/sca-equinox/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java b/sca-java-2.x/branches/sca-equinox/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
index 9c2c657b55..9c2c657b55 100644
--- a/branches/sca-equinox/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
diff --git a/branches/sca-equinox/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java b/sca-java-2.x/branches/sca-equinox/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
index 5697d819c7..5697d819c7 100644
--- a/branches/sca-equinox/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
diff --git a/branches/sca-equinox/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
index b15b40c8a6..b15b40c8a6 100644
--- a/branches/sca-equinox/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
diff --git a/branches/sca-equinox/itest/jms-callbacks/src/main/resources/jndi.properties b/sca-java-2.x/branches/sca-equinox/itest/jms-callbacks/src/main/resources/jndi.properties
index 608fe747f5..608fe747f5 100644
--- a/branches/sca-equinox/itest/jms-callbacks/src/main/resources/jndi.properties
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-callbacks/src/main/resources/jndi.properties
diff --git a/branches/sca-equinox/itest/jms-callbacks/src/main/resources/simple/client.composite b/sca-java-2.x/branches/sca-equinox/itest/jms-callbacks/src/main/resources/simple/client.composite
index 93d8acb65b..93d8acb65b 100644
--- a/branches/sca-equinox/itest/jms-callbacks/src/main/resources/simple/client.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-callbacks/src/main/resources/simple/client.composite
diff --git a/branches/sca-equinox/itest/jms-callbacks/src/main/resources/simple/tempq.composite b/sca-java-2.x/branches/sca-equinox/itest/jms-callbacks/src/main/resources/simple/tempq.composite
index 636e951d03..636e951d03 100644
--- a/branches/sca-equinox/itest/jms-callbacks/src/main/resources/simple/tempq.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-callbacks/src/main/resources/simple/tempq.composite
diff --git a/branches/sca-equinox/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
index cb9acb1bc1..cb9acb1bc1 100644
--- a/branches/sca-equinox/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
diff --git a/branches/sca-equinox/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
index 9f450574df..9f450574df 100644
--- a/branches/sca-equinox/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
diff --git a/branches/sca-equinox/itest/jms-definitions/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/jms-definitions/pom.xml
index fbaf981ea1..fbaf981ea1 100644
--- a/branches/sca-equinox/itest/jms-definitions/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-definitions/pom.xml
diff --git a/branches/sca-equinox/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index 4d00d2df0d..4d00d2df0d 100644
--- a/branches/sca-equinox/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/branches/sca-equinox/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/branches/sca-equinox/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 377f227ceb..377f227ceb 100644
--- a/branches/sca-equinox/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/branches/sca-equinox/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 6b763874df..6b763874df 100644
--- a/branches/sca-equinox/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/branches/sca-equinox/itest/jms-definitions/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/itest/jms-definitions/src/main/resources/definitions.xml
index ff389c7014..ff389c7014 100644
--- a/branches/sca-equinox/itest/jms-definitions/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-definitions/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/itest/jms-definitions/src/main/resources/definitions/definitions.composite b/sca-java-2.x/branches/sca-equinox/itest/jms-definitions/src/main/resources/definitions/definitions.composite
index 99e4e5016e..99e4e5016e 100644
--- a/branches/sca-equinox/itest/jms-definitions/src/main/resources/definitions/definitions.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-definitions/src/main/resources/definitions/definitions.composite
diff --git a/branches/sca-equinox/itest/jms-definitions/src/main/resources/jndi.properties b/sca-java-2.x/branches/sca-equinox/itest/jms-definitions/src/main/resources/jndi.properties
index f7555e0beb..f7555e0beb 100644
--- a/branches/sca-equinox/itest/jms-definitions/src/main/resources/jndi.properties
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-definitions/src/main/resources/jndi.properties
diff --git a/branches/sca-equinox/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
index 9de3bff7c3..9de3bff7c3 100644
--- a/branches/sca-equinox/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
diff --git a/branches/sca-equinox/itest/jms-selectors/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/jms-selectors/pom.xml
index 171643af57..171643af57 100644
--- a/branches/sca-equinox/itest/jms-selectors/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-selectors/pom.xml
diff --git a/branches/sca-equinox/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 0ad6440593..0ad6440593 100644
--- a/branches/sca-equinox/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/branches/sca-equinox/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java b/sca-java-2.x/branches/sca-equinox/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
index f26a3ce68b..f26a3ce68b 100644
--- a/branches/sca-equinox/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
diff --git a/branches/sca-equinox/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java b/sca-java-2.x/branches/sca-equinox/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
index fb53c877e6..fb53c877e6 100644
--- a/branches/sca-equinox/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
diff --git a/branches/sca-equinox/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java b/sca-java-2.x/branches/sca-equinox/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
index 1bbaf5d6f4..1bbaf5d6f4 100644
--- a/branches/sca-equinox/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
diff --git a/branches/sca-equinox/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java b/sca-java-2.x/branches/sca-equinox/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
index 4bdc4edcb5..4bdc4edcb5 100644
--- a/branches/sca-equinox/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
diff --git a/branches/sca-equinox/itest/jms-selectors/src/main/resources/jndi.properties b/sca-java-2.x/branches/sca-equinox/itest/jms-selectors/src/main/resources/jndi.properties
index bb431a592b..bb431a592b 100644
--- a/branches/sca-equinox/itest/jms-selectors/src/main/resources/jndi.properties
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-selectors/src/main/resources/jndi.properties
diff --git a/branches/sca-equinox/itest/jms-selectors/src/main/resources/selectors/selectors.composite b/sca-java-2.x/branches/sca-equinox/itest/jms-selectors/src/main/resources/selectors/selectors.composite
index 83fb50531b..83fb50531b 100644
--- a/branches/sca-equinox/itest/jms-selectors/src/main/resources/selectors/selectors.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-selectors/src/main/resources/selectors/selectors.composite
diff --git a/branches/sca-equinox/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
index ea548c22e6..ea548c22e6 100644
--- a/branches/sca-equinox/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
diff --git a/branches/sca-equinox/itest/jms/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/jms/pom.xml
index dcab83da79..dcab83da79 100644
--- a/branches/sca-equinox/itest/jms/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/pom.xml
diff --git a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
index 7b1c63d437..7b1c63d437 100644
--- a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
diff --git a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
index 46bf911def..46bf911def 100644
--- a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
diff --git a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
index cd3c09e17f..cd3c09e17f 100644
--- a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
diff --git a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
index ab293a5df1..ab293a5df1 100644
--- a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
diff --git a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 86d4719646..86d4719646 100644
--- a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index abb29aec4c..abb29aec4c 100644
--- a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 21d2de2cf0..21d2de2cf0 100644
--- a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
index 464072b42d..464072b42d 100644
--- a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
diff --git a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
index b4d1cbccda..b4d1cbccda 100644
--- a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
diff --git a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
index e8242467cc..e8242467cc 100644
--- a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
diff --git a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
index d376d74295..d376d74295 100644
--- a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
diff --git a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
index 142343e349..142343e349 100644
--- a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
diff --git a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index 218cccf64c..218cccf64c 100644
--- a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
index 9795089952..9795089952 100644
--- a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
diff --git a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
index 25a89fc5b4..25a89fc5b4 100644
--- a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
diff --git a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index f16f853ba7..f16f853ba7 100644
--- a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index bff4536fa0..bff4536fa0 100644
--- a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
index 80368a0fb6..80368a0fb6 100644
--- a/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
diff --git a/branches/sca-equinox/itest/jms/src/main/resources/defaults/client.composite b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/defaults/client.composite
index 991b0cf11b..991b0cf11b 100644
--- a/branches/sca-equinox/itest/jms/src/main/resources/defaults/client.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/defaults/client.composite
diff --git a/branches/sca-equinox/itest/jms/src/main/resources/defaults/service.composite b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/defaults/service.composite
index 3f299bc787..3f299bc787 100644
--- a/branches/sca-equinox/itest/jms/src/main/resources/defaults/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/defaults/service.composite
diff --git a/branches/sca-equinox/itest/jms/src/main/resources/dynamic/client.composite b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/dynamic/client.composite
index afa4135f1d..afa4135f1d 100644
--- a/branches/sca-equinox/itest/jms/src/main/resources/dynamic/client.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/dynamic/client.composite
diff --git a/branches/sca-equinox/itest/jms/src/main/resources/exceptions/client.composite b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/exceptions/client.composite
index 8bb7f86252..8bb7f86252 100644
--- a/branches/sca-equinox/itest/jms/src/main/resources/exceptions/client.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/exceptions/client.composite
diff --git a/branches/sca-equinox/itest/jms/src/main/resources/exceptions/service.composite b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/exceptions/service.composite
index 052ff9d985..052ff9d985 100644
--- a/branches/sca-equinox/itest/jms/src/main/resources/exceptions/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/exceptions/service.composite
diff --git a/branches/sca-equinox/itest/jms/src/main/resources/external/client.composite b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/external/client.composite
index 7a0013be4d..7a0013be4d 100644
--- a/branches/sca-equinox/itest/jms/src/main/resources/external/client.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/external/client.composite
diff --git a/branches/sca-equinox/itest/jms/src/main/resources/external/service.composite b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/external/service.composite
index b9f33e5afc..b9f33e5afc 100644
--- a/branches/sca-equinox/itest/jms/src/main/resources/external/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/external/service.composite
diff --git a/branches/sca-equinox/itest/jms/src/main/resources/jndi.properties b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/jndi.properties
index 9abdff215d..9abdff215d 100644
--- a/branches/sca-equinox/itest/jms/src/main/resources/jndi.properties
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/jndi.properties
diff --git a/branches/sca-equinox/itest/jms/src/main/resources/nonSCAclient/service.composite b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/nonSCAclient/service.composite
index 1baa4af6b4..1baa4af6b4 100644
--- a/branches/sca-equinox/itest/jms/src/main/resources/nonSCAclient/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/nonSCAclient/service.composite
diff --git a/branches/sca-equinox/itest/jms/src/main/resources/oneway/OneWayClient.composite b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/oneway/OneWayClient.composite
index bed0663f58..bed0663f58 100644
--- a/branches/sca-equinox/itest/jms/src/main/resources/oneway/OneWayClient.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/oneway/OneWayClient.composite
diff --git a/branches/sca-equinox/itest/jms/src/main/resources/oneway/OneWayService.composite b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/oneway/OneWayService.composite
index 3d08de7d51..3d08de7d51 100644
--- a/branches/sca-equinox/itest/jms/src/main/resources/oneway/OneWayService.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/oneway/OneWayService.composite
diff --git a/branches/sca-equinox/itest/jms/src/main/resources/properties/properties.composite b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/properties/properties.composite
index 43bd611b24..43bd611b24 100644
--- a/branches/sca-equinox/itest/jms/src/main/resources/properties/properties.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/properties/properties.composite
diff --git a/branches/sca-equinox/itest/jms/src/main/resources/simple/client.composite b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/simple/client.composite
index 3e16e794cb..3e16e794cb 100644
--- a/branches/sca-equinox/itest/jms/src/main/resources/simple/client.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/simple/client.composite
diff --git a/branches/sca-equinox/itest/jms/src/main/resources/simple/mpclient.composite b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/simple/mpclient.composite
index 69c0ef305e..69c0ef305e 100644
--- a/branches/sca-equinox/itest/jms/src/main/resources/simple/mpclient.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/simple/mpclient.composite
diff --git a/branches/sca-equinox/itest/jms/src/main/resources/simple/service.composite b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/simple/service.composite
index 2ab92923f6..2ab92923f6 100644
--- a/branches/sca-equinox/itest/jms/src/main/resources/simple/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/simple/service.composite
diff --git a/branches/sca-equinox/itest/jms/src/main/resources/simple/uriclient.composite b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/simple/uriclient.composite
index 83ef9c3c95..83ef9c3c95 100644
--- a/branches/sca-equinox/itest/jms/src/main/resources/simple/uriclient.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/main/resources/simple/uriclient.composite
diff --git a/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
index dca9386637..dca9386637 100644
--- a/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
diff --git a/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
index f4750e5453..f4750e5453 100644
--- a/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
diff --git a/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
index ba3e697e13..ba3e697e13 100644
--- a/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
diff --git a/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
index c34ad07901..c34ad07901 100644
--- a/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
diff --git a/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
index 9ec77ca440..9ec77ca440 100644
--- a/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
diff --git a/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
index 55e5a84c1c..55e5a84c1c 100644
--- a/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
diff --git a/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
index 26dda13cf9..26dda13cf9 100644
--- a/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
diff --git a/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
index 4cc229422e..4cc229422e 100644
--- a/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
diff --git a/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
index c1882a1e26..c1882a1e26 100644
--- a/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
diff --git a/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
index bed5515d7f..bed5515d7f 100644
--- a/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
diff --git a/branches/sca-equinox/itest/large-sdo-ws/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/large-sdo-ws/pom.xml
index 54fac264e9..54fac264e9 100644
--- a/branches/sca-equinox/itest/large-sdo-ws/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/large-sdo-ws/pom.xml
diff --git a/branches/sca-equinox/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java b/sca-java-2.x/branches/sca-equinox/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java
index f5a8830c4a..f5a8830c4a 100644
--- a/branches/sca-equinox/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java
diff --git a/branches/sca-equinox/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java b/sca-java-2.x/branches/sca-equinox/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java
index 14da53cf98..14da53cf98 100644
--- a/branches/sca-equinox/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java
diff --git a/branches/sca-equinox/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java b/sca-java-2.x/branches/sca-equinox/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java
index 3575d94f48..3575d94f48 100644
--- a/branches/sca-equinox/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java
diff --git a/branches/sca-equinox/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
index ac66b6a425..ac66b6a425 100644
--- a/branches/sca-equinox/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/large-sdo-ws/src/main/resources/trnInq.composite b/sca-java-2.x/branches/sca-equinox/itest/large-sdo-ws/src/main/resources/trnInq.composite
index 97594216e1..97594216e1 100644
--- a/branches/sca-equinox/itest/large-sdo-ws/src/main/resources/trnInq.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/large-sdo-ws/src/main/resources/trnInq.composite
diff --git a/branches/sca-equinox/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd b/sca-java-2.x/branches/sca-equinox/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd
index b85b80abc4..b85b80abc4 100644
--- a/branches/sca-equinox/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd
diff --git a/branches/sca-equinox/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl b/sca-java-2.x/branches/sca-equinox/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
index 842f7a9d4c..842f7a9d4c 100644
--- a/branches/sca-equinox/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
diff --git a/branches/sca-equinox/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
index 17eb575d50..17eb575d50 100644
--- a/branches/sca-equinox/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
diff --git a/branches/sca-equinox/itest/late-reference-resolution/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/pom.xml
index 0166fdfb9d..0166fdfb9d 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/pom.xml
diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/AddService.java
index d7dc4473ad..d7dc4473ad 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java
index e9b7e254e5..e9b7e254e5 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java
index da869e00fd..da869e00fd 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java
index 78ab9c6ee0..78ab9c6ee0 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java
index 1010207154..1010207154 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
index c53b55aacf..c53b55aacf 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
+++ b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite
index 378d6e9706..378d6e9706 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite
diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml
index db255e0232..db255e0232 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite
index 3fb16fa619..3fb16fa619 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite
diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 130157ac04..130157ac04 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite
index c615b4355a..c615b4355a 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite
diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml
index cba0a5c281..cba0a5c281 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java
index e4bd3035e2..e4bd3035e2 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java
diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java
index c6e0689837..c6e0689837 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java
diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
index 74e01259e2..74e01259e2 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java
index 57afc9ea50..57afc9ea50 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java
diff --git a/branches/sca-equinox/itest/oneway/build.xml b/sca-java-2.x/branches/sca-equinox/itest/oneway/build.xml
index dead32588f..dead32588f 100644
--- a/branches/sca-equinox/itest/oneway/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/oneway/build.xml
diff --git a/branches/sca-equinox/itest/oneway/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/oneway/pom.xml
index 11b6ae6495..11b6ae6495 100644
--- a/branches/sca-equinox/itest/oneway/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/oneway/pom.xml
diff --git a/branches/sca-equinox/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java b/sca-java-2.x/branches/sca-equinox/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
index 04c6069dfe..04c6069dfe 100644
--- a/branches/sca-equinox/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
diff --git a/branches/sca-equinox/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java b/sca-java-2.x/branches/sca-equinox/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
index b3cec51b1f..b3cec51b1f 100644
--- a/branches/sca-equinox/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
diff --git a/branches/sca-equinox/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
index 8013c5c0e8..8013c5c0e8 100644
--- a/branches/sca-equinox/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
diff --git a/branches/sca-equinox/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
index 01f956cb67..01f956cb67 100644
--- a/branches/sca-equinox/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
diff --git a/branches/sca-equinox/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite b/sca-java-2.x/branches/sca-equinox/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
index d053a6278c..d053a6278c 100644
--- a/branches/sca-equinox/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
diff --git a/branches/sca-equinox/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
index 776b6ffdf7..776b6ffdf7 100644
--- a/branches/sca-equinox/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
diff --git a/branches/sca-equinox/itest/operation-overloading/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/operation-overloading/pom.xml
index 8d72f62a4b..8d72f62a4b 100644
--- a/branches/sca-equinox/itest/operation-overloading/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/operation-overloading/pom.xml
diff --git a/branches/sca-equinox/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java b/sca-java-2.x/branches/sca-equinox/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
index 85b5717c00..85b5717c00 100644
--- a/branches/sca-equinox/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
diff --git a/branches/sca-equinox/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java b/sca-java-2.x/branches/sca-equinox/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
index e5d5083a2d..e5d5083a2d 100644
--- a/branches/sca-equinox/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
diff --git a/branches/sca-equinox/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java b/sca-java-2.x/branches/sca-equinox/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
index e206a86768..e206a86768 100644
--- a/branches/sca-equinox/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
diff --git a/branches/sca-equinox/itest/operation-overloading/src/main/resources/OperationOverload.composite b/sca-java-2.x/branches/sca-equinox/itest/operation-overloading/src/main/resources/OperationOverload.composite
index cbf5aa2078..cbf5aa2078 100644
--- a/branches/sca-equinox/itest/operation-overloading/src/main/resources/OperationOverload.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/operation-overloading/src/main/resources/OperationOverload.composite
diff --git a/branches/sca-equinox/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java b/sca-java-2.x/branches/sca-equinox/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
index 0b3b12c762..0b3b12c762 100644
--- a/branches/sca-equinox/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
index 82d536cbfe..82d536cbfe 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/pom.xml
index d7082695d5..d7082695d5 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/pom.xml
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
index fba9a109b3..fba9a109b3 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
index 225dce0236..225dce0236 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 2b8c973e2c..2b8c973e2c 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a1c7fce60a..a1c7fce60a 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 4647a716c7..4647a716c7 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index cc5d44d279..cc5d44d279 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index 1b7fb15bf1..1b7fb15bf1 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e97331c06c..e97331c06c 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 2d1bb68e5b..2d1bb68e5b 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index 0f88cca213..0f88cca213 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index f55a068ede..f55a068ede 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index c39a34cb96..c39a34cb96 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 600f3f0c74..600f3f0c74 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index 0ba54b363a..0ba54b363a 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
index 7edc392f46..7edc392f46 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
index 7edc392f46..7edc392f46 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
index 4779eff514..4779eff514 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
index d505834f15..d505834f15 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
index 6bcf6cef0a..6bcf6cef0a 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
index 210a68011f..210a68011f 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
index e23e1a2ecd..e23e1a2ecd 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
index 9832da880e..9832da880e 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
index 5586179421..5586179421 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
index ccc4f84ee4..ccc4f84ee4 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
index 644b207e70..644b207e70 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
index e649870356..e649870356 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
index 8e8e33ecd1..8e8e33ecd1 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
index 2f4b56835b..2f4b56835b 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
index 5f4a8b94ec..5f4a8b94ec 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
index 57d2ac9e4d..57d2ac9e4d 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
index 2e1399bb3b..2e1399bb3b 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
index bb8fb2b07c..bb8fb2b07c 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/build-bundles.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/build-bundles.xml
index 82d536cbfe..82d536cbfe 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/build-bundles.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/build-bundles.xml
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/pom.xml
index 711d807d5b..711d807d5b 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/pom.xml
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
index fba9a109b3..fba9a109b3 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
index 225dce0236..225dce0236 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index d0b0a13e6d..d0b0a13e6d 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a1c7fce60a..a1c7fce60a 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 4647a716c7..4647a716c7 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index d2bf71ed28..d2bf71ed28 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index 1b7fb15bf1..1b7fb15bf1 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e97331c06c..e97331c06c 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 2556a0cfa0..2556a0cfa0 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index 0f88cca213..0f88cca213 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index f55a068ede..f55a068ede 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index e180c37e3f..e180c37e3f 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 600f3f0c74..600f3f0c74 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index 0ba54b363a..0ba54b363a 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
index 7edc392f46..7edc392f46 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
index 7edc392f46..7edc392f46 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
index 828dc6f472..828dc6f472 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
index 9293b1ff52..9293b1ff52 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
index 03077aa4d4..03077aa4d4 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
index 210a68011f..210a68011f 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
index c96deb4e1b..c96deb4e1b 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
index 9832da880e..9832da880e 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
index 5586179421..5586179421 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
index ccc4f84ee4..ccc4f84ee4 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
index 404995a90f..404995a90f 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
index 0441e8c6f0..0441e8c6f0 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
index ac0ca72030..ac0ca72030 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
index 2f4b56835b..2f4b56835b 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
index 61f62fa16e..61f62fa16e 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
index dc4aa2c30e..dc4aa2c30e 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
index d149165366..d149165366 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
index 4a18aed5f3..4a18aed5f3 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-test/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-test/pom.xml
index 0c89b0102f..0c89b0102f 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-test/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-test/pom.xml
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
index 108481fcbd..108481fcbd 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
index 28fe368663..28fe368663 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
index be3b7365e5..be3b7365e5 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
index 03372349f8..03372349f8 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
index a2b3a7bc92..a2b3a7bc92 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
index ea8d272a0c..ea8d272a0c 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
diff --git a/branches/sca-equinox/itest/osgi-contribution/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/pom.xml
index 0f8fd625f8..0f8fd625f8 100644
--- a/branches/sca-equinox/itest/osgi-contribution/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-contribution/pom.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/build-bundles.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/build-bundles.xml
index 53bf014546..53bf014546 100644
--- a/branches/sca-equinox/itest/osgi-implementation/build-bundles.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/build-bundles.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/pom.xml
index 2178557417..2178557417 100644
--- a/branches/sca-equinox/itest/osgi-implementation/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/pom.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
index cfecd989fe..cfecd989fe 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
index 43bc26f2f5..43bc26f2f5 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
index f78878ef47..f78878ef47 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
index 1c65ca573b..1c65ca573b 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
index 5383e1e268..5383e1e268 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
index b2af2fa68d..b2af2fa68d 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
index c05a3f52a8..c05a3f52a8 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
index c92f078e49..c92f078e49 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
index af269052c7..af269052c7 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
index 5eb16be597..5eb16be597 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
index 8479624546..8479624546 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
index 3aedabc29c..3aedabc29c 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
index b12e094bc1..b12e094bc1 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
index 59e128b993..59e128b993 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
index ff6f16cba3..ff6f16cba3 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
index 4524c6bd3d..4524c6bd3d 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
index bcd24ef0b1..bcd24ef0b1 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
index 903f8bf229..903f8bf229 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
index fe8bd23f07..fe8bd23f07 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
index ec30d641ac..ec30d641ac 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
index 34baca71d1..34baca71d1 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/Greetings.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
index 9285c0a8d5..9285c0a8d5 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
index 16d0eae990..16d0eae990 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
index 3d0e045225..3d0e045225 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
index c055aee142..c055aee142 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
index 661eb5a8cb..661eb5a8cb 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
index 0588da9a85..0588da9a85 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
index fff67e1978..fff67e1978 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
index 98085449e6..98085449e6 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
index 5089019671..5089019671 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
index 1aabf4d10c..1aabf4d10c 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
index 039a214856..039a214856 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
index 4a3cd4aed2..4a3cd4aed2 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
index 2251bf5be6..2251bf5be6 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
index e2d25bf47d..e2d25bf47d 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
index f2ae804ad1..f2ae804ad1 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
index a47f68c579..a47f68c579 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
index 25d7bcf2ff..25d7bcf2ff 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
index 2762bc62be..2762bc62be 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 80346311b1..80346311b1 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a879505610..a879505610 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
index c8cb522cf4..c8cb522cf4 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 546971860e..546971860e 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
index 593e55f3f5..593e55f3f5 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
index 18483817ad..18483817ad 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
index 5ba42780f2..5ba42780f2 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
index bc569d0ac0..bc569d0ac0 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
index 599ab51a50..599ab51a50 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index df52c6c760..df52c6c760 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index aca5943552..aca5943552 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e71c624f49..e71c624f49 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
index a036ecfc76..a036ecfc76 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
index db877bb366..db877bb366 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
index ee1f575e70..ee1f575e70 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
index 09e60ca626..09e60ca626 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
index 7dd70889c7..7dd70889c7 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
index 354f40a064..354f40a064 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index d0cf43a960..d0cf43a960 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index ff40a7ae36..ff40a7ae36 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
index ef989d6fcf..ef989d6fcf 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index effae8c246..effae8c246 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
index 4effadf208..4effadf208 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
index 13bce67bb4..13bce67bb4 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
index 071a131f40..071a131f40 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
index 6ebd1f2894..6ebd1f2894 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
index b66961b1c2..b66961b1c2 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index 9edf3567e5..9edf3567e5 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
index 659f16be7f..659f16be7f 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 7c9e102fd2..7c9e102fd2 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index bb04ff42e0..bb04ff42e0 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
index 3317816557..3317816557 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
index 6d1ad76796..6d1ad76796 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
index 71e248590b..71e248590b 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
index 7c1125bbb5..7c1125bbb5 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
index 8456b878f2..8456b878f2 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
index d5a47c6403..d5a47c6403 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
index e6391d2159..e6391d2159 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
index c79ede815b..c79ede815b 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
index 04cc73b85c..04cc73b85c 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
index 9ece700efe..9ece700efe 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
index 52bc43478d..52bc43478d 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/Customer.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
index 0b8d2e5851..0b8d2e5851 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/factory-test.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
index 87370a6df4..87370a6df4 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
index 127349eacf..127349eacf 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
index 7e3810c458..7e3810c458 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
index fb9a112d18..fb9a112d18 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
index ee732b5efc..ee732b5efc 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
index b1723660d7..b1723660d7 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
index fb9a112d18..fb9a112d18 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
index ee732b5efc..ee732b5efc 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
index b1723660d7..b1723660d7 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
index 5172cbe21e..5172cbe21e 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
index b7591e732d..b7591e732d 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
index cf8717fcf5..cf8717fcf5 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
index 785212fa6d..785212fa6d 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
index 7a06030e32..7a06030e32 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
index 5c39b53b0a..5c39b53b0a 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
index b8bb809319..b8bb809319 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
index 26f32fe617..26f32fe617 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
index 1b9e0e847e..1b9e0e847e 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
index 6066a38f29..6066a38f29 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
index 777edd3f7d..777edd3f7d 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
index d8adaa2ba3..d8adaa2ba3 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
index e0bd9d8c10..e0bd9d8c10 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
index 6005ae785c..6005ae785c 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
index 6f0b79ebc2..6f0b79ebc2 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
index d4b461460e..d4b461460e 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
index bb15e6e3aa..bb15e6e3aa 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
index 7591201b8c..7591201b8c 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
index 0e844fab99..0e844fab99 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
index fc86a76784..fc86a76784 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
index a8a87c5c8c..a8a87c5c8c 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
index 05bbf4db88..05bbf4db88 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
index a12d1a21ea..a12d1a21ea 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
index 2214db11a6..2214db11a6 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
index 8d44067992..8d44067992 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
index 60c0fb3fd3..60c0fb3fd3 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
index ca1392d2b8..ca1392d2b8 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
index 7c9f67c36d..7c9f67c36d 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
index 760c761666..760c761666 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
index 7d56770311..7d56770311 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
index 321bdc713f..321bdc713f 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
index 66f98011cb..66f98011cb 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
index 6874a66db9..6874a66db9 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
index 47d290eb1a..47d290eb1a 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
index c7f13a50a7..c7f13a50a7 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
index f4c102c4f0..f4c102c4f0 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
index cbebf7eec2..cbebf7eec2 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
index 6a3c845cca..6a3c845cca 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
index cb6345432f..cb6345432f 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
index 89871fa8f6..89871fa8f6 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
index d968d1ffc5..d968d1ffc5 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
index fc762df8d5..fc762df8d5 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
index 02e42bc010..02e42bc010 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
index 390367b99b..390367b99b 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
index 4715cbd976..4715cbd976 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
index 932fb8a483..932fb8a483 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
index b10d0416dc..b10d0416dc 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
index c799f31606..c799f31606 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
index db68d7e333..db68d7e333 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
index 1aea3cf669..1aea3cf669 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
index 106bd1b6aa..106bd1b6aa 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
index 1e3c915a59..1e3c915a59 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
index d7d0b41f5e..d7d0b41f5e 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
index 81c51e6804..81c51e6804 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
index ca50b554df..ca50b554df 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
index 14658127f8..14658127f8 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
index 335bc419c1..335bc419c1 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
index a68b9d6dbb..a68b9d6dbb 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
index 02f79c15f3..02f79c15f3 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
index 8428b08d96..8428b08d96 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
index c81bf00d00..c81bf00d00 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
index 61c161617c..61c161617c 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
index fd6a26a65f..fd6a26a65f 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
index 0168bc2435..0168bc2435 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
index 6674cdd7f2..6674cdd7f2 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
index 72df35ef41..72df35ef41 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
index 724c8132df..724c8132df 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
index 1e5035d949..1e5035d949 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
index 85bfd86422..85bfd86422 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
index 6e51b3d6f2..6e51b3d6f2 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
index 9a87758ec2..9a87758ec2 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
index e134bd1061..e134bd1061 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
index c19895bab1..c19895bab1 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
index 707609d2c4..707609d2c4 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
index e084e5831a..e084e5831a 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
index d96f6481fb..d96f6481fb 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
index 10ef690c9b..10ef690c9b 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
index 003f9dca5a..003f9dca5a 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
index fefdea106d..fefdea106d 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
index f6b847ed59..f6b847ed59 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
index 5cff2f573e..5cff2f573e 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
index ca50b554df..ca50b554df 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
index 14658127f8..14658127f8 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
index 0fec68a725..0fec68a725 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
index ca50b554df..ca50b554df 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
index 14658127f8..14658127f8 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
index 678014d48d..678014d48d 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
index f0090fb52b..f0090fb52b 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
index 0b50923a05..0b50923a05 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
index 1000a5f974..1000a5f974 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
index 4e392a9ff1..4e392a9ff1 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
index b10d0416dc..b10d0416dc 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
index 788ec4f19a..788ec4f19a 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
index 1ba16d0693..1ba16d0693 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
index a55ebd02a8..a55ebd02a8 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
index e7459360e6..e7459360e6 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
index d518ecab62..d518ecab62 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
index d7d0b41f5e..d7d0b41f5e 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
index 880304187b..880304187b 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
index d72db04425..d72db04425 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
index f9c1218f82..f9c1218f82 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
index d8e4c1cb7e..d8e4c1cb7e 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
index a6de268bf6..a6de268bf6 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
index 660e277693..660e277693 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
index 5e0965d047..5e0965d047 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
index 5e0965d047..5e0965d047 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
index 5e0965d047..5e0965d047 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
index 5e0965d047..5e0965d047 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
index 02ae93aec2..02ae93aec2 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
index c94504f07d..c94504f07d 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/properties-test.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
index fea03404fd..fea03404fd 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
index 3c425fcbc9..3c425fcbc9 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
index f6c04de980..f6c04de980 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
index 87918132e6..87918132e6 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
index 9b00787162..9b00787162 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
index 2ecc0bea43..2ecc0bea43 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
index af79dc4bdf..af79dc4bdf 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/Customer.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/Customer.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/Customer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/Customer.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/Retailer.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/Shipper.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
index c144a1bc18..c144a1bc18 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/services-test.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/services-test.composite
index 64f3b30f88..64f3b30f88 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/services-test.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/services/services-test.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
index 0b0aa0912b..0b0aa0912b 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Customer1.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Customer2.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
index 877d0de1c9..877d0de1c9 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/version-test.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/version-test.composite
index bbb397ee70..bbb397ee70 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/version-test.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/version/version-test.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
index 617200d8dd..617200d8dd 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
index 213cde2c1d..213cde2c1d 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
index 0dca0da75e..0dca0da75e 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
index 953045fefa..953045fefa 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
index c621d9aca0..c621d9aca0 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
index 6d3f853382..6d3f853382 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
index d545c844d2..d545c844d2 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
index 54b9b00bc8..54b9b00bc8 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
index b26bfbd98d..b26bfbd98d 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
index 667df7aa12..667df7aa12 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
index a95437f8c1..a95437f8c1 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
index c5d94df93d..c5d94df93d 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
index d340923938..d340923938 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
index c1f11d0b6e..c1f11d0b6e 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
index 49afb3d8e8..49afb3d8e8 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
index a858c18a90..a858c18a90 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
index a9941aebcd..a9941aebcd 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
index 8e939b1a83..8e939b1a83 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
index 39d90bb75c..39d90bb75c 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
index 5376687b61..5376687b61 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
index 6d8dc1021e..6d8dc1021e 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
index e037ae9675..e037ae9675 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
index eecf67913d..eecf67913d 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
index 203bf5123c..203bf5123c 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
index 429b1f10ef..429b1f10ef 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
index dbc980f8c4..dbc980f8c4 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
index e39295a402..e39295a402 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
index c2f6bff4f5..c2f6bff4f5 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
index 17ba7a2f14..17ba7a2f14 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
index 8c33720018..8c33720018 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
index 0c6edd6691..0c6edd6691 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
index 0b48ac90ba..0b48ac90ba 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
index c84741f34f..c84741f34f 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
index 5a9b2a8b1d..5a9b2a8b1d 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
index 7b95c12038..7b95c12038 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
diff --git a/branches/sca-equinox/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
index 8399991503..8399991503 100644
--- a/branches/sca-equinox/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
index 4616ef166a..4616ef166a 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
index 2e3137239e..2e3137239e 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
index 0dafffdb8c..0dafffdb8c 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
index 6356718fe5..6356718fe5 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
index c9f77b71cf..c9f77b71cf 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
index 1fba0d6dcd..1fba0d6dcd 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java
index 8bf7a1fb2f..8bf7a1fb2f 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
index ba9b7007b4..ba9b7007b4 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
index 85397195bd..85397195bd 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
index 9346fb8ed2..9346fb8ed2 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
index 501cded48d..501cded48d 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
index 687335b3c4..687335b3c4 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
index f605e024ba..f605e024ba 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
index 4f5640960b..4f5640960b 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
index 9a491304bf..9a491304bf 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
index 2e0b49e693..2e0b49e693 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
index eac9979f56..eac9979f56 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
index 62c0eef16d..62c0eef16d 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
index 155dd368a3..155dd368a3 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
index b45c062761..b45c062761 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
index c2dae9eb97..c2dae9eb97 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
index 8985947286..8985947286 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
index 6a38f48c4a..6a38f48c4a 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
diff --git a/branches/sca-equinox/itest/osgi-tuscany/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/pom.xml
index 795059712d..795059712d 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/pom.xml
diff --git a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/build-bundles.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/build-bundles.xml
index c7ea66863f..c7ea66863f 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/build-bundles.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/build-bundles.xml
diff --git a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/pom.xml
index 9cf8457384..9cf8457384 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/pom.xml
diff --git a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
index 0ac96b35a3..0ac96b35a3 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
index a3aa2531fc..a3aa2531fc 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 5f1342c40b..5f1342c40b 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index f5708dec40..f5708dec40 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
index 17b342f8dd..17b342f8dd 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index afaf7aea02..afaf7aea02 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
index cd204ebc2e..cd204ebc2e 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index ca720085c5..ca720085c5 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
index b4807b80d1..b4807b80d1 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
index f71d822bbe..f71d822bbe 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
diff --git a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
index 13a3c9b82a..13a3c9b82a 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
diff --git a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
index b524abc2a6..b524abc2a6 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
index 5be79b741a..5be79b741a 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
diff --git a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
index 8549ca3409..8549ca3409 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
diff --git a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
index 88d1e72efc..88d1e72efc 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
diff --git a/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
index acd6670f88..acd6670f88 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
diff --git a/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
index 0c26477a43..0c26477a43 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
diff --git a/branches/sca-equinox/itest/osgi-tuscany/tuscany-versioned/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/tuscany-versioned/pom.xml
index 3665171791..3665171791 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/tuscany-versioned/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/osgi-tuscany/tuscany-versioned/pom.xml
diff --git a/branches/sca-equinox/itest/policy-security-basicauth/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/policy-security-basicauth/pom.xml
index 9fa88412e5..9fa88412e5 100644
--- a/branches/sca-equinox/itest/policy-security-basicauth/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy-security-basicauth/pom.xml
diff --git a/branches/sca-equinox/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
index 55b798edbe..55b798edbe 100644
--- a/branches/sca-equinox/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
diff --git a/branches/sca-equinox/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-equinox/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
index 411dcae605..411dcae605 100644
--- a/branches/sca-equinox/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-equinox/itest/policy-security-basicauth/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/itest/policy-security-basicauth/src/main/resources/definitions.xml
index 9099191b27..9099191b27 100644
--- a/branches/sca-equinox/itest/policy-security-basicauth/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy-security-basicauth/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/itest/policy-security-basicauth/src/main/resources/helloworld.composite b/sca-java-2.x/branches/sca-equinox/itest/policy-security-basicauth/src/main/resources/helloworld.composite
index 247b2b56e4..247b2b56e4 100644
--- a/branches/sca-equinox/itest/policy-security-basicauth/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy-security-basicauth/src/main/resources/helloworld.composite
diff --git a/branches/sca-equinox/itest/policy-security-basicauth/src/main/resources/jndi.properties b/sca-java-2.x/branches/sca-equinox/itest/policy-security-basicauth/src/main/resources/jndi.properties
index 9abdff215d..9abdff215d 100644
--- a/branches/sca-equinox/itest/policy-security-basicauth/src/main/resources/jndi.properties
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy-security-basicauth/src/main/resources/jndi.properties
diff --git a/branches/sca-equinox/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
index 10fbac4e20..10fbac4e20 100644
--- a/branches/sca-equinox/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
diff --git a/branches/sca-equinox/itest/policy-security-jsr250/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/policy-security-jsr250/pom.xml
index 3af71b9412..3af71b9412 100644
--- a/branches/sca-equinox/itest/policy-security-jsr250/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy-security-jsr250/pom.xml
diff --git a/branches/sca-equinox/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
index 3569410e7d..3569410e7d 100644
--- a/branches/sca-equinox/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
index 3e752144a0..3e752144a0 100644
--- a/branches/sca-equinox/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/itest/policy-security-jsr250/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/itest/policy-security-jsr250/src/main/resources/definitions.xml
index 64b8a95d18..64b8a95d18 100644
--- a/branches/sca-equinox/itest/policy-security-jsr250/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy-security-jsr250/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/itest/policy-security-jsr250/src/main/resources/helloworld.composite b/sca-java-2.x/branches/sca-equinox/itest/policy-security-jsr250/src/main/resources/helloworld.composite
index 456ca450f1..456ca450f1 100644
--- a/branches/sca-equinox/itest/policy-security-jsr250/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy-security-jsr250/src/main/resources/helloworld.composite
diff --git a/branches/sca-equinox/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java b/sca-java-2.x/branches/sca-equinox/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
index da5f6409ba..da5f6409ba 100644
--- a/branches/sca-equinox/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
diff --git a/branches/sca-equinox/itest/policy-security/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/policy-security/pom.xml
index 3c87efd209..3c87efd209 100644
--- a/branches/sca-equinox/itest/policy-security/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy-security/pom.xml
diff --git a/branches/sca-equinox/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-equinox/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/itest/policy-security/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-equinox/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/itest/policy-security/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/itest/policy-security/src/main/resources/definitions.xml
index c8118a0caf..c8118a0caf 100644
--- a/branches/sca-equinox/itest/policy-security/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy-security/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/itest/policy-security/src/main/resources/helloworld.composite b/sca-java-2.x/branches/sca-equinox/itest/policy-security/src/main/resources/helloworld.composite
index 9e0f289f87..9e0f289f87 100644
--- a/branches/sca-equinox/itest/policy-security/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy-security/src/main/resources/helloworld.composite
diff --git a/branches/sca-equinox/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
index 9dad17741e..9dad17741e 100644
--- a/branches/sca-equinox/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
diff --git a/branches/sca-equinox/itest/policy/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/policy/pom.xml
index a1b3a48798..a1b3a48798 100644
--- a/branches/sca-equinox/itest/policy/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/pom.xml
diff --git a/branches/sca-equinox/itest/policy/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/AddService.java
index 3e56bf3fad..3e56bf3fad 100644
--- a/branches/sca-equinox/itest/policy/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/itest/policy/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-equinox/itest/policy/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/itest/policy/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/CalculatorClient.java
index 9abc488523..9abc488523 100644
--- a/branches/sca-equinox/itest/policy/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/itest/policy/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/CalculatorService.java
index a1880698ea..a1880698ea 100644
--- a/branches/sca-equinox/itest/policy/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
index 28ce0ec78a..28ce0ec78a 100644
--- a/branches/sca-equinox/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/itest/policy/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/DivideService.java
index f72b05cece..f72b05cece 100644
--- a/branches/sca-equinox/itest/policy/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/itest/policy/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-equinox/itest/policy/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/itest/policy/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-equinox/itest/policy/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-equinox/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/itest/policy/src/main/java/calculator/PolicyQNames.java b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/PolicyQNames.java
index 3e1bc45842..3e1bc45842 100644
--- a/branches/sca-equinox/itest/policy/src/main/java/calculator/PolicyQNames.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/PolicyQNames.java
diff --git a/branches/sca-equinox/itest/policy/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-equinox/itest/policy/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/itest/policy/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-equinox/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
index 4b04a4d0b8..4b04a4d0b8 100644
--- a/branches/sca-equinox/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
diff --git a/branches/sca-equinox/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
index 3dcadd724e..3dcadd724e 100644
--- a/branches/sca-equinox/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
diff --git a/branches/sca-equinox/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
index 3d314a9d14..3d314a9d14 100644
--- a/branches/sca-equinox/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
diff --git a/branches/sca-equinox/itest/policy/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/resources/Calculator.composite
index aed7684099..aed7684099 100644
--- a/branches/sca-equinox/itest/policy/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index a20489035b..a20489035b 100644
--- a/branches/sca-equinox/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index d9f144b3ff..d9f144b3ff 100644
--- a/branches/sca-equinox/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-equinox/itest/policy/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/resources/definitions.xml
index 0009d712f3..0009d712f3 100644
--- a/branches/sca-equinox/itest/policy/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
index 885e8314ef..885e8314ef 100644
--- a/branches/sca-equinox/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
diff --git a/branches/sca-equinox/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java b/sca-java-2.x/branches/sca-equinox/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java
index ba17755b88..ba17755b88 100644
--- a/branches/sca-equinox/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java
diff --git a/branches/sca-equinox/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
index 3aa6565c01..3aa6565c01 100644
--- a/branches/sca-equinox/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
diff --git a/branches/sca-equinox/itest/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/pom.xml
index ce92812cb6..ce92812cb6 100644
--- a/branches/sca-equinox/itest/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/pom.xml
diff --git a/branches/sca-equinox/itest/promotion-interface-missmatch/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/promotion-interface-missmatch/pom.xml
index 69b1852c23..69b1852c23 100644
--- a/branches/sca-equinox/itest/promotion-interface-missmatch/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/promotion-interface-missmatch/pom.xml
diff --git a/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java b/sca-java-2.x/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java
index 764f31b7cd..764f31b7cd 100644
--- a/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java
diff --git a/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java b/sca-java-2.x/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java
index 0c72b52ed9..0c72b52ed9 100644
--- a/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java
diff --git a/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java
index d6545b5a23..d6545b5a23 100644
--- a/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java
diff --git a/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java b/sca-java-2.x/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java
index 30ea559694..30ea559694 100644
--- a/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java
diff --git a/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java
index b3b6f033e5..b3b6f033e5 100644
--- a/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java
diff --git a/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/resources/example.composite b/sca-java-2.x/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/resources/example.composite
index cddf951d65..cddf951d65 100644
--- a/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/resources/example.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/resources/example.composite
diff --git a/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl b/sca-java-2.x/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl
index a8ccde2e11..a8ccde2e11 100644
--- a/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl
diff --git a/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd b/sca-java-2.x/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd
index 2caec0f20d..2caec0f20d 100644
--- a/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd
diff --git a/branches/sca-equinox/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java
index 740af4f43d..740af4f43d 100644
--- a/branches/sca-equinox/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java
diff --git a/branches/sca-equinox/itest/properties/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/properties/pom.xml
index 9efb698593..9efb698593 100644
--- a/branches/sca-equinox/itest/properties/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/pom.xml
diff --git a/branches/sca-equinox/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
index b0fd64c9da..b0fd64c9da 100644
--- a/branches/sca-equinox/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
diff --git a/branches/sca-equinox/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
index 51d064ba81..51d064ba81 100644
--- a/branches/sca-equinox/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
diff --git a/branches/sca-equinox/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
index 38c26e70d6..38c26e70d6 100644
--- a/branches/sca-equinox/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
diff --git a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
index 68ce5a3cb6..68ce5a3cb6 100644
--- a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
diff --git a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
index 6b714c0d67..6b714c0d67 100644
--- a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
diff --git a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
index 586d4864a9..586d4864a9 100644
--- a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
diff --git a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
index 5e3c985144..5e3c985144 100644
--- a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
diff --git a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
index 52f9871d1b..52f9871d1b 100644
--- a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
diff --git a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
index 5b93bd8b8a..5b93bd8b8a 100644
--- a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
diff --git a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
index c0c068d12e..c0c068d12e 100644
--- a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
diff --git a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
index acd1f26670..acd1f26670 100644
--- a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
diff --git a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
index 71dce41efc..71dce41efc 100644
--- a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
diff --git a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
index 17b4e582d6..17b4e582d6 100644
--- a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
diff --git a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
index eb642b6637..eb642b6637 100644
--- a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
diff --git a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
index a57ccd90c8..a57ccd90c8 100644
--- a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
diff --git a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
index c147a2affe..c147a2affe 100644
--- a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
diff --git a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
index 0a84e93828..0a84e93828 100644
--- a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
diff --git a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
index 6344a8aa83..6344a8aa83 100644
--- a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
diff --git a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
index 11a0a758cd..11a0a758cd 100644
--- a/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
diff --git a/branches/sca-equinox/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
index 76bcd06fca..76bcd06fca 100644
--- a/branches/sca-equinox/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
diff --git a/branches/sca-equinox/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
index 7a809ebf1e..7a809ebf1e 100644
--- a/branches/sca-equinox/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
diff --git a/branches/sca-equinox/itest/properties/src/main/java/test/jaxb/props/package-info.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/test/jaxb/props/package-info.java
index f726552a62..f726552a62 100644
--- a/branches/sca-equinox/itest/properties/src/main/java/test/jaxb/props/package-info.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/java/test/jaxb/props/package-info.java
diff --git a/branches/sca-equinox/itest/properties/src/main/resources/ConstructorPropertyInjection.composite b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
index 70a251fa16..70a251fa16 100644
--- a/branches/sca-equinox/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
diff --git a/branches/sca-equinox/itest/properties/src/main/resources/Outer.composite b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/resources/Outer.composite
index b3e529e8b5..b3e529e8b5 100644
--- a/branches/sca-equinox/itest/properties/src/main/resources/Outer.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/resources/Outer.composite
diff --git a/branches/sca-equinox/itest/properties/src/main/resources/OuterPropertyTest.composite b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/resources/OuterPropertyTest.composite
index 5237e964a3..5237e964a3 100644
--- a/branches/sca-equinox/itest/properties/src/main/resources/OuterPropertyTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/resources/OuterPropertyTest.composite
diff --git a/branches/sca-equinox/itest/properties/src/main/resources/PropertyTest.composite b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/resources/PropertyTest.composite
index 75deddbdad..75deddbdad 100644
--- a/branches/sca-equinox/itest/properties/src/main/resources/PropertyTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/resources/PropertyTest.composite
diff --git a/branches/sca-equinox/itest/properties/src/main/resources/customer.xsd b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/resources/customer.xsd
index 8861d7e7b8..8861d7e7b8 100644
--- a/branches/sca-equinox/itest/properties/src/main/resources/customer.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/resources/customer.xsd
diff --git a/branches/sca-equinox/itest/properties/src/main/resources/fileProperty.txt b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/resources/fileProperty.txt
index 0d3d9ead83..0d3d9ead83 100644
--- a/branches/sca-equinox/itest/properties/src/main/resources/fileProperty.txt
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/resources/fileProperty.txt
diff --git a/branches/sca-equinox/itest/properties/src/main/resources/manyValuesFileProperty.txt b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/resources/manyValuesFileProperty.txt
index 450f397b30..450f397b30 100644
--- a/branches/sca-equinox/itest/properties/src/main/resources/manyValuesFileProperty.txt
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/resources/manyValuesFileProperty.txt
diff --git a/branches/sca-equinox/itest/properties/src/main/resources/mySimpleService.composite b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/resources/mySimpleService.composite
index 75fdd24add..75fdd24add 100644
--- a/branches/sca-equinox/itest/properties/src/main/resources/mySimpleService.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/resources/mySimpleService.composite
diff --git a/branches/sca-equinox/itest/properties/src/main/resources/rcProps.txt b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/resources/rcProps.txt
index 052c291fd0..052c291fd0 100644
--- a/branches/sca-equinox/itest/properties/src/main/resources/rcProps.txt
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/resources/rcProps.txt
diff --git a/branches/sca-equinox/itest/properties/src/main/resources/rcprops.xsd b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/resources/rcprops.xsd
index 21289fa7b2..21289fa7b2 100644
--- a/branches/sca-equinox/itest/properties/src/main/resources/rcprops.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/main/resources/rcprops.xsd
diff --git a/branches/sca-equinox/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
index 8cf182e24a..8cf182e24a 100644
--- a/branches/sca-equinox/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
diff --git a/branches/sca-equinox/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
index 28357c5bbe..28357c5bbe 100644
--- a/branches/sca-equinox/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
diff --git a/branches/sca-equinox/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
index 6979659ece..6979659ece 100644
--- a/branches/sca-equinox/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
diff --git a/branches/sca-equinox/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
index 8ee5dce91f..8ee5dce91f 100644
--- a/branches/sca-equinox/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
diff --git a/branches/sca-equinox/itest/recursive-multi-level/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/recursive-multi-level/pom.xml
index 92d9108c6a..92d9108c6a 100644
--- a/branches/sca-equinox/itest/recursive-multi-level/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-multi-level/pom.xml
diff --git a/branches/sca-equinox/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java b/sca-java-2.x/branches/sca-equinox/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
index 214d4d8a1f..214d4d8a1f 100644
--- a/branches/sca-equinox/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
diff --git a/branches/sca-equinox/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
index 51948a3b81..51948a3b81 100644
--- a/branches/sca-equinox/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
diff --git a/branches/sca-equinox/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java b/sca-java-2.x/branches/sca-equinox/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
index 08df8ade17..08df8ade17 100644
--- a/branches/sca-equinox/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
diff --git a/branches/sca-equinox/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
index 2ad9f815f0..2ad9f815f0 100644
--- a/branches/sca-equinox/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
diff --git a/branches/sca-equinox/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
index 975f61c664..975f61c664 100644
--- a/branches/sca-equinox/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
diff --git a/branches/sca-equinox/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
index f9bbcc76d8..f9bbcc76d8 100644
--- a/branches/sca-equinox/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
diff --git a/branches/sca-equinox/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
index 09fd10fb7e..09fd10fb7e 100644
--- a/branches/sca-equinox/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
diff --git a/branches/sca-equinox/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
index d8d6fe0dc5..d8d6fe0dc5 100644
--- a/branches/sca-equinox/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
diff --git a/branches/sca-equinox/itest/recursive-ws/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/pom.xml
index fcf8b0c56c..fcf8b0c56c 100644
--- a/branches/sca-equinox/itest/recursive-ws/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/pom.xml
diff --git a/branches/sca-equinox/itest/recursive-ws/src/main/java/policy/Target.java b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/java/policy/Target.java
index c77fcea868..c77fcea868 100644
--- a/branches/sca-equinox/itest/recursive-ws/src/main/java/policy/Target.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/java/policy/Target.java
diff --git a/branches/sca-equinox/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
index 87e412829e..87e412829e 100644
--- a/branches/sca-equinox/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
diff --git a/branches/sca-equinox/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
index e565055252..e565055252 100644
--- a/branches/sca-equinox/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
diff --git a/branches/sca-equinox/itest/recursive-ws/src/main/java/recursive/Composer.java b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/java/recursive/Composer.java
index e53f99d9c3..e53f99d9c3 100644
--- a/branches/sca-equinox/itest/recursive-ws/src/main/java/recursive/Composer.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/java/recursive/Composer.java
diff --git a/branches/sca-equinox/itest/recursive-ws/src/main/java/recursive/ComposerClient.java b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
index 7956d153cb..7956d153cb 100644
--- a/branches/sca-equinox/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
diff --git a/branches/sca-equinox/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
index 3d75b7b165..3d75b7b165 100644
--- a/branches/sca-equinox/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
diff --git a/branches/sca-equinox/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
index 8b77484922..8b77484922 100644
--- a/branches/sca-equinox/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
diff --git a/branches/sca-equinox/itest/recursive-ws/src/main/java/recursive/ComposerServer.java b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
index 5035d1cbd9..5035d1cbd9 100644
--- a/branches/sca-equinox/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
diff --git a/branches/sca-equinox/itest/recursive-ws/src/main/resources/Client.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/resources/Client.composite
index 56d7c01377..56d7c01377 100644
--- a/branches/sca-equinox/itest/recursive-ws/src/main/resources/Client.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/resources/Client.composite
diff --git a/branches/sca-equinox/itest/recursive-ws/src/main/resources/Inner.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/resources/Inner.composite
index b054ae0944..b054ae0944 100644
--- a/branches/sca-equinox/itest/recursive-ws/src/main/resources/Inner.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/resources/Inner.composite
diff --git a/branches/sca-equinox/itest/recursive-ws/src/main/resources/Outer.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/resources/Outer.composite
index 3c3f327b28..3c3f327b28 100644
--- a/branches/sca-equinox/itest/recursive-ws/src/main/resources/Outer.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/resources/Outer.composite
diff --git a/branches/sca-equinox/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
index b5c180919c..b5c180919c 100644
--- a/branches/sca-equinox/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
diff --git a/branches/sca-equinox/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
index 891cac0b79..891cac0b79 100644
--- a/branches/sca-equinox/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
diff --git a/branches/sca-equinox/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
index 4b398743eb..4b398743eb 100644
--- a/branches/sca-equinox/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
diff --git a/branches/sca-equinox/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
index b50bc29a1f..b50bc29a1f 100644
--- a/branches/sca-equinox/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
diff --git a/branches/sca-equinox/itest/recursive-ws/src/main/resources/policy/definitions.xml b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/resources/policy/definitions.xml
index 3ae202f4aa..3ae202f4aa 100644
--- a/branches/sca-equinox/itest/recursive-ws/src/main/resources/policy/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/main/resources/policy/definitions.xml
diff --git a/branches/sca-equinox/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
index c6e46564f0..c6e46564f0 100644
--- a/branches/sca-equinox/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
diff --git a/branches/sca-equinox/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
index 3e71246da2..3e71246da2 100644
--- a/branches/sca-equinox/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
diff --git a/branches/sca-equinox/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
index 6638d65551..6638d65551 100644
--- a/branches/sca-equinox/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
diff --git a/branches/sca-equinox/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
index 214379bcea..214379bcea 100644
--- a/branches/sca-equinox/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
diff --git a/branches/sca-equinox/itest/recursive/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/recursive/pom.xml
index 9a452cb59d..9a452cb59d 100644
--- a/branches/sca-equinox/itest/recursive/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/pom.xml
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/circular/include/DemoClass.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/circular/include/DemoClass.java
index fe42911486..fe42911486 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/circular/include/DemoClass.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/circular/include/DemoClass.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/composite/CompositeClient.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/composite/CompositeClient.java
index 5edc305970..5edc305970 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/composite/CompositeClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/composite/CompositeClient.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/composite/Source.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/composite/Source.java
index d0efcc1df1..d0efcc1df1 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/composite/Source.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/composite/Source.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/composite/SourceCallback.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/composite/SourceCallback.java
index baa95a8e39..baa95a8e39 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/composite/SourceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/composite/SourceCallback.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/composite/SourceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/composite/SourceImpl.java
index b9a0c7ff74..b9a0c7ff74 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/composite/SourceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/composite/SourceImpl.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/composite/Target.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/composite/Target.java
index 9a8f68a7fa..9a8f68a7fa 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/composite/Target.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/composite/Target.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/composite/TargetImpl.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/composite/TargetImpl.java
index 86686e9233..86686e9233 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/composite/TargetImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/composite/TargetImpl.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/foo/A.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/foo/A.java
index e87cbde26d..e87cbde26d 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/foo/A.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/foo/A.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/foo/B.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/foo/B.java
index 9d060cab59..9d060cab59 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/foo/B.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/foo/B.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/foo/I.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/foo/I.java
index f6d55baef3..f6d55baef3 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/foo/I.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/foo/I.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/policy/Target.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/policy/Target.java
index c77fcea868..c77fcea868 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/policy/Target.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/policy/Target.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/policy/TargetClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/policy/TargetClientImpl.java
index 87e412829e..87e412829e 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/policy/TargetClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/policy/TargetClientImpl.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/policy/TargetServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/policy/TargetServiceImpl.java
index e565055252..e565055252 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/policy/TargetServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/policy/TargetServiceImpl.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/sample/ComponentAImpl.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/sample/ComponentAImpl.java
index f513949105..f513949105 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/sample/ComponentAImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/sample/ComponentAImpl.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/sample/ComponentCImpl.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/sample/ComponentCImpl.java
index 586a9ee6a7..586a9ee6a7 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/sample/ComponentCImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/sample/ComponentCImpl.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/sample/ComponentEImpl.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/sample/ComponentEImpl.java
index dbf2735aa7..dbf2735aa7 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/sample/ComponentEImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/sample/ComponentEImpl.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/sample/ComponentFImpl.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/sample/ComponentFImpl.java
index 5e136e536c..5e136e536c 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/sample/ComponentFImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/sample/ComponentFImpl.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/sample/Service1.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/sample/Service1.java
index 81bdce79f1..81bdce79f1 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/sample/Service1.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/sample/Service1.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/test/Aggregator.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/test/Aggregator.java
index 88b3bed1b2..88b3bed1b2 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/test/Aggregator.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/test/Aggregator.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/test/AggregatorImpl.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/test/AggregatorImpl.java
index f6ac6c8741..f6ac6c8741 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/test/AggregatorImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/test/AggregatorImpl.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/test/InnerSourceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/test/InnerSourceImpl.java
index c8dad5ae35..c8dad5ae35 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/test/InnerSourceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/test/InnerSourceImpl.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/test/OuterSourceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/test/OuterSourceImpl.java
index 11816e82cf..11816e82cf 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/test/OuterSourceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/test/OuterSourceImpl.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/test/Source.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/test/Source.java
index 9b93740d9d..9b93740d9d 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/test/Source.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/test/Source.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/test1/composite/Target.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/test1/composite/Target.java
index 4883e12f49..4883e12f49 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/test1/composite/Target.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/test1/composite/Target.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/test1/composite/TargetOne.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/test1/composite/TargetOne.java
index a7c68f4ffd..a7c68f4ffd 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/test1/composite/TargetOne.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/test1/composite/TargetOne.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/java/test1/composite/TargetTwo.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/test1/composite/TargetTwo.java
index 7fff8e2e9b..7fff8e2e9b 100644
--- a/branches/sca-equinox/itest/recursive/src/main/java/test1/composite/TargetTwo.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/java/test1/composite/TargetTwo.java
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/AComposite.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/AComposite.composite
index 1b5dee8762..1b5dee8762 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/AComposite.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/AComposite.composite
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/BComposite.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/BComposite.composite
index 7d4588eba4..7d4588eba4 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/BComposite.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/BComposite.composite
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/CComposite.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/CComposite.composite
index 6d7b4ec600..6d7b4ec600 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/CComposite.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/CComposite.composite
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/Composite1.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/Composite1.composite
index 56fd7c621f..56fd7c621f 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/Composite1.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/Composite1.composite
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/Composite2.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/Composite2.composite
index 54f10673a4..54f10673a4 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/Composite2.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/Composite2.composite
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/Composite3.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/Composite3.composite
index 040653493f..040653493f 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/Composite3.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/Composite3.composite
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/Demo1Composite.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/Demo1Composite.composite
index 6b2a964b9b..6b2a964b9b 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/Demo1Composite.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/Demo1Composite.composite
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/Demo2Composite.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/Demo2Composite.composite
index 6b8c0a348e..6b8c0a348e 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/Demo2Composite.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/Demo2Composite.composite
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/Inner.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/Inner.composite
index 398ebdf6e2..398ebdf6e2 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/Inner.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/Inner.composite
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/InnerComposite.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/InnerComposite.composite
index 3376ac8ff5..3376ac8ff5 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/InnerComposite.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/InnerComposite.composite
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/InnerComposite2.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/InnerComposite2.composite
index c9eff4fa9d..c9eff4fa9d 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/InnerComposite2.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/InnerComposite2.composite
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
index 289b92a3f2..289b92a3f2 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/Outer.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/Outer.composite
index 987990d854..987990d854 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/Outer.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/Outer.composite
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/OuterComposite.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/OuterComposite.composite
index cb1c1e13d4..cb1c1e13d4 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/OuterComposite.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/OuterComposite.composite
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/foo/foo.png b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/foo/foo.png
index 0f2ec78aaf..0f2ec78aaf 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/foo/foo.png
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/foo/foo.png
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/foo/o1.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/foo/o1.composite
index 1d31c2f424..1d31c2f424 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/foo/o1.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/foo/o1.composite
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/foo/o2.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/foo/o2.composite
index 4f21c21860..4f21c21860 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/foo/o2.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/foo/o2.composite
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/foo/o3.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/foo/o3.composite
index 72c732c03e..72c732c03e 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/foo/o3.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/foo/o3.composite
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/foo/o4.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/foo/o4.composite
index f8f07eed09..f8f07eed09 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/foo/o4.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/foo/o4.composite
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite
index 4a6df023b8..4a6df023b8 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite
index 25007aebb2..25007aebb2 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/policy/definitions.xml b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/policy/definitions.xml
index 957028e3bd..957028e3bd 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/policy/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/policy/definitions.xml
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/test1/InnerComposite.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/test1/InnerComposite.composite
index 177fa10550..177fa10550 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/test1/InnerComposite.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/test1/InnerComposite.composite
diff --git a/branches/sca-equinox/itest/recursive/src/main/resources/test1/OuterComposite.composite b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/test1/OuterComposite.composite
index d05a67f45f..d05a67f45f 100644
--- a/branches/sca-equinox/itest/recursive/src/main/resources/test1/OuterComposite.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/main/resources/test1/OuterComposite.composite
diff --git a/branches/sca-equinox/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java
index 1f7c35dd91..1f7c35dd91 100644
--- a/branches/sca-equinox/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java
diff --git a/branches/sca-equinox/itest/recursive/src/test/java/composite/CompositeTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/composite/CompositeTestCase.java
index 5482e47463..5482e47463 100644
--- a/branches/sca-equinox/itest/recursive/src/test/java/composite/CompositeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/composite/CompositeTestCase.java
diff --git a/branches/sca-equinox/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
index f042113f7a..f042113f7a 100644
--- a/branches/sca-equinox/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
diff --git a/branches/sca-equinox/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
index 87eb948452..87eb948452 100644
--- a/branches/sca-equinox/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
diff --git a/branches/sca-equinox/itest/recursive/src/test/java/foo/O2TestCase.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/foo/O2TestCase.java
index d617ec8592..d617ec8592 100644
--- a/branches/sca-equinox/itest/recursive/src/test/java/foo/O2TestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/foo/O2TestCase.java
diff --git a/branches/sca-equinox/itest/recursive/src/test/java/foo/O4TestCase.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/foo/O4TestCase.java
index 15626c75ac..15626c75ac 100644
--- a/branches/sca-equinox/itest/recursive/src/test/java/foo/O4TestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/foo/O4TestCase.java
diff --git a/branches/sca-equinox/itest/recursive/src/test/java/policy/PolicyTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/policy/PolicyTestCase.java
index c9cc84f7d4..c9cc84f7d4 100644
--- a/branches/sca-equinox/itest/recursive/src/test/java/policy/PolicyTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/policy/PolicyTestCase.java
diff --git a/branches/sca-equinox/itest/recursive/src/test/java/sample/C.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/sample/C.java
index bf8391348b..bf8391348b 100644
--- a/branches/sca-equinox/itest/recursive/src/test/java/sample/C.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/sample/C.java
diff --git a/branches/sca-equinox/itest/recursive/src/test/java/sample/CImpl.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/sample/CImpl.java
index 466284983e..466284983e 100644
--- a/branches/sca-equinox/itest/recursive/src/test/java/sample/CImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/sample/CImpl.java
diff --git a/branches/sca-equinox/itest/recursive/src/test/java/sample/NestedTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/sample/NestedTestCase.java
index fc5d251460..fc5d251460 100644
--- a/branches/sca-equinox/itest/recursive/src/test/java/sample/NestedTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/sample/NestedTestCase.java
diff --git a/branches/sca-equinox/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
index a543add69b..a543add69b 100644
--- a/branches/sca-equinox/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
diff --git a/branches/sca-equinox/itest/recursive/src/test/java/sample/X.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/sample/X.java
index e3a9335068..e3a9335068 100644
--- a/branches/sca-equinox/itest/recursive/src/test/java/sample/X.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/sample/X.java
diff --git a/branches/sca-equinox/itest/recursive/src/test/java/sample/XImpl.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/sample/XImpl.java
index e430807568..e430807568 100644
--- a/branches/sca-equinox/itest/recursive/src/test/java/sample/XImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/sample/XImpl.java
diff --git a/branches/sca-equinox/itest/recursive/src/test/java/sample/Y.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/sample/Y.java
index c15a4f635a..c15a4f635a 100644
--- a/branches/sca-equinox/itest/recursive/src/test/java/sample/Y.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/sample/Y.java
diff --git a/branches/sca-equinox/itest/recursive/src/test/java/sample/YImpl.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/sample/YImpl.java
index 994c9eb95f..994c9eb95f 100644
--- a/branches/sca-equinox/itest/recursive/src/test/java/sample/YImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/sample/YImpl.java
diff --git a/branches/sca-equinox/itest/recursive/src/test/java/test/InnerTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/test/InnerTestCase.java
index ebb4bc7acb..ebb4bc7acb 100644
--- a/branches/sca-equinox/itest/recursive/src/test/java/test/InnerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/test/InnerTestCase.java
diff --git a/branches/sca-equinox/itest/recursive/src/test/java/test/OuterTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/test/OuterTestCase.java
index 6e95f5808b..6e95f5808b 100644
--- a/branches/sca-equinox/itest/recursive/src/test/java/test/OuterTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/test/OuterTestCase.java
diff --git a/branches/sca-equinox/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
index b3abcac06e..b3abcac06e 100644
--- a/branches/sca-equinox/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
diff --git a/branches/sca-equinox/itest/references/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/references/pom.xml
index d09feccacc..d09feccacc 100644
--- a/branches/sca-equinox/itest/references/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/references/pom.xml
diff --git a/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java b/sca-java-2.x/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
index f8c0850118..f8c0850118 100644
--- a/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
diff --git a/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
index 647fff0159..647fff0159 100644
--- a/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
diff --git a/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java b/sca-java-2.x/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
index 785920bb2d..785920bb2d 100644
--- a/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
diff --git a/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
index 6b1065ab0d..6b1065ab0d 100644
--- a/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
diff --git a/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java b/sca-java-2.x/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
index d436c28adc..d436c28adc 100644
--- a/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
diff --git a/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
index a1823e1cdc..a1823e1cdc 100644
--- a/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
diff --git a/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java b/sca-java-2.x/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
index 2618ec7095..2618ec7095 100644
--- a/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
diff --git a/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
index 79c802bc97..79c802bc97 100644
--- a/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
diff --git a/branches/sca-equinox/itest/references/src/main/resources/AutoWiredReferencesTest.composite b/sca-java-2.x/branches/sca-equinox/itest/references/src/main/resources/AutoWiredReferencesTest.composite
index 9f88f05abe..9f88f05abe 100644
--- a/branches/sca-equinox/itest/references/src/main/resources/AutoWiredReferencesTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/references/src/main/resources/AutoWiredReferencesTest.composite
diff --git a/branches/sca-equinox/itest/references/src/main/resources/InnerReferencesTest.composite b/sca-java-2.x/branches/sca-equinox/itest/references/src/main/resources/InnerReferencesTest.composite
index 6cadc52c13..6cadc52c13 100644
--- a/branches/sca-equinox/itest/references/src/main/resources/InnerReferencesTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/references/src/main/resources/InnerReferencesTest.composite
diff --git a/branches/sca-equinox/itest/references/src/main/resources/ManualWiredReferencesTest.composite b/sca-java-2.x/branches/sca-equinox/itest/references/src/main/resources/ManualWiredReferencesTest.composite
index 3b546a34e0..3b546a34e0 100644
--- a/branches/sca-equinox/itest/references/src/main/resources/ManualWiredReferencesTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/references/src/main/resources/ManualWiredReferencesTest.composite
diff --git a/branches/sca-equinox/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
index b803f4bfa4..b803f4bfa4 100644
--- a/branches/sca-equinox/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
diff --git a/branches/sca-equinox/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
index 1d8284f0fd..1d8284f0fd 100644
--- a/branches/sca-equinox/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
diff --git a/branches/sca-equinox/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
index 4b3a745a19..4b3a745a19 100644
--- a/branches/sca-equinox/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
diff --git a/branches/sca-equinox/itest/scopes/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/scopes/pom.xml
index 7b6cccf6a2..7b6cccf6a2 100644
--- a/branches/sca-equinox/itest/scopes/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/scopes/pom.xml
diff --git a/branches/sca-equinox/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java b/sca-java-2.x/branches/sca-equinox/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
index 4aa414be8e..4aa414be8e 100644
--- a/branches/sca-equinox/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
diff --git a/branches/sca-equinox/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java b/sca-java-2.x/branches/sca-equinox/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
index fae4dcd586..fae4dcd586 100644
--- a/branches/sca-equinox/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
diff --git a/branches/sca-equinox/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java b/sca-java-2.x/branches/sca-equinox/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
index 878f7e4cc6..878f7e4cc6 100644
--- a/branches/sca-equinox/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
diff --git a/branches/sca-equinox/itest/scopes/src/main/resources/scopes.composite b/sca-java-2.x/branches/sca-equinox/itest/scopes/src/main/resources/scopes.composite
index 54a1b66830..54a1b66830 100644
--- a/branches/sca-equinox/itest/scopes/src/main/resources/scopes.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/scopes/src/main/resources/scopes.composite
diff --git a/branches/sca-equinox/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
index ce2519cbc0..ce2519cbc0 100644
--- a/branches/sca-equinox/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
diff --git a/branches/sca-equinox/itest/serialization/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/serialization/pom.xml
index c3d89b1cb2..c3d89b1cb2 100644
--- a/branches/sca-equinox/itest/serialization/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/serialization/pom.xml
diff --git a/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
index fa0f1c88d6..fa0f1c88d6 100644
--- a/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
diff --git a/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java
index 85d5dd860c..85d5dd860c 100644
--- a/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java
diff --git a/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
index 50c98d1afc..50c98d1afc 100644
--- a/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
diff --git a/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
index c268f9bda7..c268f9bda7 100644
--- a/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
diff --git a/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
index cf0307eb8e..cf0307eb8e 100644
--- a/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
diff --git a/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java
index deb8f75816..deb8f75816 100644
--- a/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java
diff --git a/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
index 60ecb7717a..60ecb7717a 100644
--- a/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
diff --git a/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
index 8a1fe48436..8a1fe48436 100644
--- a/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
diff --git a/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
index ffe3a3b8ef..ffe3a3b8ef 100644
--- a/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
diff --git a/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
index 24d43f79e3..24d43f79e3 100644
--- a/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
diff --git a/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
index 2749891bd4..2749891bd4 100644
--- a/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
diff --git a/branches/sca-equinox/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite
index 28c32d6fa4..28c32d6fa4 100644
--- a/branches/sca-equinox/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite
diff --git a/branches/sca-equinox/itest/serialization/src/main/resources/nestedcomposite.composite b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/resources/nestedcomposite.composite
index 8e1a132b0a..8e1a132b0a 100644
--- a/branches/sca-equinox/itest/serialization/src/main/resources/nestedcomposite.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/main/resources/nestedcomposite.composite
diff --git a/branches/sca-equinox/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
index 76e77284fb..76e77284fb 100644
--- a/branches/sca-equinox/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
diff --git a/branches/sca-equinox/itest/services/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/services/pom.xml
index 28163e39f9..28163e39f9 100644
--- a/branches/sca-equinox/itest/services/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/services/pom.xml
diff --git a/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java b/sca-java-2.x/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
index 1304ba4288..1304ba4288 100644
--- a/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
diff --git a/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
index 3577e09add..3577e09add 100644
--- a/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
diff --git a/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java b/sca-java-2.x/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
index 2e9b56d64d..2e9b56d64d 100644
--- a/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
diff --git a/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
index cda3f38636..cda3f38636 100644
--- a/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
diff --git a/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java b/sca-java-2.x/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
index 39806a8101..39806a8101 100644
--- a/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
diff --git a/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
index 8713e5ab22..8713e5ab22 100644
--- a/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
diff --git a/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java b/sca-java-2.x/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
index aa745deb63..aa745deb63 100644
--- a/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
diff --git a/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java b/sca-java-2.x/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
index 83da15089f..83da15089f 100644
--- a/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
diff --git a/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java b/sca-java-2.x/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
index 36189f94bb..36189f94bb 100644
--- a/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
diff --git a/branches/sca-equinox/itest/services/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/services/src/main/resources/META-INF/sca-contribution.xml
index 37ea8f677d..37ea8f677d 100644
--- a/branches/sca-equinox/itest/services/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/services/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/services/src/main/resources/ServicesTest.composite b/sca-java-2.x/branches/sca-equinox/itest/services/src/main/resources/ServicesTest.composite
index eda885f9ec..eda885f9ec 100644
--- a/branches/sca-equinox/itest/services/src/main/resources/ServicesTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/services/src/main/resources/ServicesTest.composite
diff --git a/branches/sca-equinox/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
index ba6cac279c..ba6cac279c 100644
--- a/branches/sca-equinox/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
diff --git a/branches/sca-equinox/itest/spring/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/spring/pom.xml
index 1aee148d75..1aee148d75 100644
--- a/branches/sca-equinox/itest/spring/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/spring/pom.xml
diff --git a/branches/sca-equinox/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml b/sca-java-2.x/branches/sca-equinox/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
index 18ab7e332d..18ab7e332d 100644
--- a/branches/sca-equinox/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
diff --git a/branches/sca-equinox/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-2.x/branches/sca-equinox/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
index 62e4e077b6..62e4e077b6 100644
--- a/branches/sca-equinox/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/branches/sca-equinox/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/sca-java-2.x/branches/sca-equinox/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
index 70b2d5fdab..70b2d5fdab 100644
--- a/branches/sca-equinox/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
diff --git a/branches/sca-equinox/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/sca-java-2.x/branches/sca-equinox/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
index bab9ecb528..bab9ecb528 100644
--- a/branches/sca-equinox/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
diff --git a/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
index 634e3d34af..634e3d34af 100644
--- a/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java b/sca-java-2.x/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
index aeb7918add..aeb7918add 100644
--- a/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
diff --git a/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java b/sca-java-2.x/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
index 3957e49bf3..3957e49bf3 100644
--- a/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
diff --git a/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java b/sca-java-2.x/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
index d75d19295d..d75d19295d 100644
--- a/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
diff --git a/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
index 4088691ccd..4088691ccd 100644
--- a/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
diff --git a/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
index 840bf59b73..840bf59b73 100644
--- a/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
diff --git a/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java b/sca-java-2.x/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
index fa7967c964..fa7967c964 100644
--- a/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
diff --git a/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java b/sca-java-2.x/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
index b57cc7f366..b57cc7f366 100644
--- a/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
diff --git a/branches/sca-equinox/itest/transaction/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/transaction/pom.xml
index 1163ff778c..1163ff778c 100644
--- a/branches/sca-equinox/itest/transaction/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/transaction/pom.xml
diff --git a/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
index d7d18181d9..d7d18181d9 100644
--- a/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
diff --git a/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
index ac986dd417..ac986dd417 100644
--- a/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
diff --git a/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
index a6ea036da7..a6ea036da7 100644
--- a/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
diff --git a/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
index 3e1cb29f33..3e1cb29f33 100644
--- a/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
diff --git a/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
index 4d504a6a36..4d504a6a36 100644
--- a/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
diff --git a/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
index 156b34227d..156b34227d 100644
--- a/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
diff --git a/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
index b7ea5f2663..b7ea5f2663 100644
--- a/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
diff --git a/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
index 341a7e53e3..341a7e53e3 100644
--- a/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
diff --git a/branches/sca-equinox/itest/transaction/src/main/resources/accounts.composite b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/main/resources/accounts.composite
index f4c6b650c7..f4c6b650c7 100644
--- a/branches/sca-equinox/itest/transaction/src/main/resources/accounts.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/main/resources/accounts.composite
diff --git a/branches/sca-equinox/itest/transaction/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/main/resources/definitions.xml
index 8aa6ba313a..8aa6ba313a 100644
--- a/branches/sca-equinox/itest/transaction/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/itest/transaction/src/main/resources/log4j.properties b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/main/resources/log4j.properties
index 698ee41d7e..698ee41d7e 100644
--- a/branches/sca-equinox/itest/transaction/src/main/resources/log4j.properties
+++ b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/main/resources/log4j.properties
diff --git a/branches/sca-equinox/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
index c23628ff91..c23628ff91 100644
--- a/branches/sca-equinox/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
diff --git a/branches/sca-equinox/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
index 36884f6098..36884f6098 100644
--- a/branches/sca-equinox/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
diff --git a/branches/sca-equinox/itest/validation/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/validation/pom.xml
index c3bbc067d6..c3bbc067d6 100644
--- a/branches/sca-equinox/itest/validation/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/pom.xml
diff --git a/branches/sca-equinox/itest/validation/src/main/java/binding/ejb/account/Customer.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/binding/ejb/account/Customer.java
index acb74c38ae..acb74c38ae 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/binding/ejb/account/Customer.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/binding/ejb/account/Customer.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
index 52ddfa9aba..52ddfa9aba 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/binding/ejb/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
index aec8998083..aec8998083 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
index 5df24b6379..5df24b6379 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/binding/jms/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/binding/jms/HelloWorldService.java
index 33bfe1d0ea..33bfe1d0ea 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/binding/jms/HelloWorldService.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
index a6a40b0ed1..a6a40b0ed1 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/AddService.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/AddService.java
index 35ba2cbfac..35ba2cbfac 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/AddService.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
index ef305370cc..ef305370cc 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
index aacde27842..aacde27842 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
index 185f17a5ca..185f17a5ca 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/CalculatorService.java
index f472d6aaf6..f472d6aaf6 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/CalculatorService.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
index 77aafe83de..77aafe83de 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/DivideService.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/DivideService.java
index a93d23e61c..a93d23e61c 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/DivideService.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
index 080594034b..080594034b 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/MultiplyService.java
index 20d48e93d5..20d48e93d5 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/MultiplyService.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
index 96f0b55fa2..96f0b55fa2 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/PropertyService.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/PropertyService.java
index 4f1ccc96f8..4f1ccc96f8 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/PropertyService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/PropertyService.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
index 429daf5f2d..429daf5f2d 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/SubtractService.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/SubtractService.java
index 40e382dc74..40e382dc74 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/SubtractService.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
index 8cdbe0813d..8cdbe0813d 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
index d5e9fcf020..d5e9fcf020 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/impl/java/AddService.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/java/AddService.java
index 0db8ce4f5c..0db8ce4f5c 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/impl/java/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/java/AddService.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/impl/java/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/java/AddServiceImpl.java
index 83f2685d54..83f2685d54 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/impl/java/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/java/AddServiceImpl.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/impl/java/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/java/CalculatorClient.java
index e34ce3db26..e34ce3db26 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/impl/java/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/java/CalculatorClient.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/impl/java/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/java/CalculatorService.java
index 5d583fd604..5d583fd604 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/impl/java/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/java/CalculatorService.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
index 0183e2a259..0183e2a259 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/impl/java/DivideService.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/java/DivideService.java
index 85ebadc9a0..85ebadc9a0 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/impl/java/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/java/DivideService.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/impl/java/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
index 863c298234..863c298234 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/impl/java/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/java/MultiplyService.java
index e1bf7fbddc..e1bf7fbddc 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/impl/java/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/java/MultiplyService.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
index 6346ea3582..6346ea3582 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/impl/java/SubtractService.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/java/SubtractService.java
index 57759bb496..57759bb496 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/impl/java/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/java/SubtractService.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
index 16e3e6a23d..16e3e6a23d 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/impl/spring/HelloWorld.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/spring/HelloWorld.java
index ef0b491617..ef0b491617 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/impl/spring/HelloWorld.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/spring/HelloWorld.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
index 2e3458f0d3..2e3458f0d3 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
index 87904f2a72..87904f2a72 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
index fa1a621f12..fa1a621f12 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
diff --git a/branches/sca-equinox/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
index ebf7a79589..ebf7a79589 100644
--- a/branches/sca-equinox/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
index b2e7da05a2..b2e7da05a2 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
index 4ba9f0724b..4ba9f0724b 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
index b935dd194a..b935dd194a 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
index 2b633f3139..2b633f3139 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
index 940e27a1e7..940e27a1e7 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
index 50d78cb2a6..50d78cb2a6 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
index bd788e47b8..bd788e47b8 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
index 7281878c0f..7281878c0f 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
index 609ffed02d..609ffed02d 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
index 08e18decc1..08e18decc1 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
index 36e71e398b..36e71e398b 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
index 9a46e09363..9a46e09363 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
index 59017f0c09..59017f0c09 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
index 462a95dd02..462a95dd02 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
index 4b6c44bd58..4b6c44bd58 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
index a397e3384c..a397e3384c 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
index 08fab865fa..08fab865fa 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
index 3a5f59b17c..3a5f59b17c 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
index 8221e41430..8221e41430 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
index 9c5ae7027f..9c5ae7027f 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
index 3c85ed32e2..3c85ed32e2 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
index 2d1a1e01f0..2d1a1e01f0 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
index efb457ac9e..efb457ac9e 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
index a5beaf4ec9..a5beaf4ec9 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
index 06c3eeeaca..06c3eeeaca 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
index 821ce570c8..821ce570c8 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/XsdValidation/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/XsdValidation/Calculator.composite
index 63ccaa9957..63ccaa9957 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/XsdValidation/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/XsdValidation/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
index da565081f3..da565081f3 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
index 6153d40c3d..6153d40c3d 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
index a3eb60bf58..a3eb60bf58 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
index 6233d47d8d..6233d47d8d 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
index 6a9af9e070..6a9af9e070 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
index 49b26c78f8..49b26c78f8 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
index c34a160b61..c34a160b61 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
index 293c4d725d..293c4d725d 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
index b7ff1e304f..b7ff1e304f 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl
index 218dbc47c4..218dbc47c4 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite
index 5975c27663..5975c27663 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
index 8cda0b007e..8cda0b007e 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
index 781319d619..781319d619 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
index 8a0dfac98b..8a0dfac98b 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
index fcfe408582..fcfe408582 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
index ede3b3fd40..ede3b3fd40 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
index a8c89a0bf5..a8c89a0bf5 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
index b4e56d1789..b4e56d1789 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
index e68eb75d64..e68eb75d64 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
index 00c7a3f86b..00c7a3f86b 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
index d656d47cfd..d656d47cfd 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
index ad1daacfcf..ad1daacfcf 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite
index 145aea9fbc..145aea9fbc 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite
index c52da84a0c..c52da84a0c 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
index fb35f5d1b8..fb35f5d1b8 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
index fcdf25455c..fcdf25455c 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
index 14f1314a1b..14f1314a1b 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
index 1a3cb21ac6..1a3cb21ac6 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
index 80b8f9d938..80b8f9d938 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
index 8fd1e2f554..8fd1e2f554 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
index b74682e1bd..b74682e1bd 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite
index f439ab6260..f439ab6260 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
index e22f30152e..e22f30152e 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
index 6ef7558d95..6ef7558d95 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
index 77a2715373..77a2715373 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
index 6e5fcf1286..6e5fcf1286 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
index 8a2a1a23be..8a2a1a23be 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
index 70f91d1a7d..70f91d1a7d 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
index 7f5eb546e0..7f5eb546e0 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
index 0dfe52985a..0dfe52985a 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
index d3f249720d..d3f249720d 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
index a8eb389704..a8eb389704 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
index 575927a5de..575927a5de 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
index a8eb389704..a8eb389704 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
index 973d1f618a..973d1f618a 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
index 5d2aeddc3d..5d2aeddc3d 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType
index 077df56290..077df56290 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
index 68df3156a8..68df3156a8 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
index a8eb389704..a8eb389704 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
index 695fd60887..695fd60887 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite
index 94ee650207..94ee650207 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
index f3cf93ddaa..f3cf93ddaa 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
index f9016219a5..f9016219a5 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
index 634c13b3cc..634c13b3cc 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
index 0d1861f2f5..0d1861f2f5 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
index 0d1861f2f5..0d1861f2f5 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
index 634c13b3cc..634c13b3cc 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
index 881c24854b..881c24854b 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
index 4e680f1200..4e680f1200 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
index e01643ed8f..e01643ed8f 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
index d776882ed0..d776882ed0 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
index 0d1ffc97e4..0d1ffc97e4 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
index e69de29bb2..e69de29bb2 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
index 99c529d77f..99c529d77f 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
index c75f209b6d..c75f209b6d 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
index a5874707da..a5874707da 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
index 393b9fe674..393b9fe674 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
index 1dca444938..1dca444938 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
index 9a60183c5c..9a60183c5c 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
index 70f91d1a7d..70f91d1a7d 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
index bc7bf3f250..bc7bf3f250 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
index a1a699fc75..a1a699fc75 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
index 7446e4f06a..7446e4f06a 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
index 0bbb10706e..0bbb10706e 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
index 9d9376ad6c..9d9376ad6c 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
index 3885357625..3885357625 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
index d9252ba54f..d9252ba54f 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
index 53d1a581f0..53d1a581f0 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
index ac45d95ce8..ac45d95ce8 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
index 5cf6963a96..5cf6963a96 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
index d31c705fb5..d31c705fb5 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
index d214a7f40a..d214a7f40a 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
index ede1786942..ede1786942 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
index fcb43c949b..fcb43c949b 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
index 8346dcc01a..8346dcc01a 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
diff --git a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
index 60f4de5cd3..60f4de5cd3 100644
--- a/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
diff --git a/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/ContributionReadException.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
index 55999fe27d..55999fe27d 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
index 5ab65b2f64..5ab65b2f64 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
index 52803411cf..52803411cf 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
index 8adf1aa2aa..8adf1aa2aa 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
index 2790cd0a6c..2790cd0a6c 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
index c6daaebfe5..c6daaebfe5 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
index 204034737b..204034737b 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
index ff2e413ab7..ff2e413ab7 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
index 1632f95689..1632f95689 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
index 054f5a6035..054f5a6035 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
index f3f61ec04b..f3f61ec04b 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
index 76d8a63b51..76d8a63b51 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
index 95c108e6db..95c108e6db 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
index 2f66bbfe0c..2f66bbfe0c 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
index decf234753..decf234753 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
index 445a41700b..445a41700b 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
index 531573a0aa..531573a0aa 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
index 758e19d264..758e19d264 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
index 96319438b6..96319438b6 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
index a2a4caa0b0..a2a4caa0b0 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
index 0d91afd7e6..0d91afd7e6 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
index 048fcc7d43..048fcc7d43 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
index 856c9f3b27..856c9f3b27 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
index b584cb8d94..b584cb8d94 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
index ae26008564..ae26008564 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
index fedc1f7530..fedc1f7530 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
index d94643cbc9..d94643cbc9 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
index 4cbe3def2d..4cbe3def2d 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
index 2fe8af318c..2fe8af318c 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
index 09865ab855..09865ab855 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
index 3be31d5994..3be31d5994 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
index 303b8299ad..303b8299ad 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
index f4ba8eb4e6..f4ba8eb4e6 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
index a7b23ed10f..a7b23ed10f 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
index 96d8debd4a..96d8debd4a 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
index 7246d6e0a3..7246d6e0a3 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
index 3ffd10f36f..3ffd10f36f 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
index 0e0e4cd2bd..0e0e4cd2bd 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
index 45c7af3d1f..45c7af3d1f 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
index ef2d13aaaa..ef2d13aaaa 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
index 9014fb00e5..9014fb00e5 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
index 69382b0456..69382b0456 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
index 057039b4df..057039b4df 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
index cda4f9cb57..cda4f9cb57 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
index e8475bb865..e8475bb865 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
index 88721a18e2..88721a18e2 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
index 1a0739eaa5..1a0739eaa5 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
index c20c551d92..c20c551d92 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
index 7ae97638ce..7ae97638ce 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
index 6e5eb41ba0..6e5eb41ba0 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
index 2eec73f815..2eec73f815 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
index ab2c373486..ab2c373486 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
index 9b5adee7e6..9b5adee7e6 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
index 1b8116a469..1b8116a469 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
index c848cbb243..c848cbb243 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
index bcd6637a03..bcd6637a03 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
index 60b0c51fef..60b0c51fef 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
index dd38802bbe..dd38802bbe 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
index d83a4bfed9..d83a4bfed9 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
index b64de39c80..b64de39c80 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/domain/CustomCompositeBuilder.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
index e6f3bce5df..e6f3bce5df 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
index 690fb97a31..690fb97a31 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
index a768535fde..a768535fde 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
index 64d41bdb48..64d41bdb48 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
index 585bd62027..585bd62027 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
index aab3529fba..aab3529fba 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
index 4c3226f4c8..4c3226f4c8 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
index b9c0b68f7e..b9c0b68f7e 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
index fc32e96b52..fc32e96b52 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
index 4b367f85ef..4b367f85ef 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
index 969690acaf..969690acaf 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
index eef964e274..eef964e274 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
index c2fd7b3410..c2fd7b3410 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
index c6a58d2b88..c6a58d2b88 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
index ff0b2f3589..ff0b2f3589 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
index 7b445960f1..7b445960f1 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
index 6b4521cdc9..6b4521cdc9 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
index f46e9e4035..f46e9e4035 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
index ed95bcdcf0..ed95bcdcf0 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
index bd5a6d9601..bd5a6d9601 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
index 390eeb7e95..390eeb7e95 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
index e2bee4d2ac..e2bee4d2ac 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
index 3b567da717..3b567da717 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
index fc03bc25eb..fc03bc25eb 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
index d41d72585f..d41d72585f 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
index 2d4bb3d499..2d4bb3d499 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
index 5b5bfe7b37..5b5bfe7b37 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
index 8ef3cacc4e..8ef3cacc4e 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
index 38d59196dd..38d59196dd 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
index 9671f9c983..9671f9c983 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
index b3ccb8b278..b3ccb8b278 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
diff --git a/branches/sca-equinox/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
index 08c27ee011..08c27ee011 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
diff --git a/branches/sca-equinox/itest/wasAdmin.py b/sca-java-2.x/branches/sca-equinox/itest/wasAdmin.py
index 2be2b1eff7..2be2b1eff7 100644
--- a/branches/sca-equinox/itest/wasAdmin.py
+++ b/sca-java-2.x/branches/sca-equinox/itest/wasAdmin.py
diff --git a/branches/sca-equinox/itest/wires/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/wires/pom.xml
index e72c40af52..e72c40af52 100644
--- a/branches/sca-equinox/itest/wires/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/wires/pom.xml
diff --git a/branches/sca-equinox/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java b/sca-java-2.x/branches/sca-equinox/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
index 09d5b0278e..09d5b0278e 100644
--- a/branches/sca-equinox/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
diff --git a/branches/sca-equinox/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
index f0964ebb93..f0964ebb93 100644
--- a/branches/sca-equinox/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
diff --git a/branches/sca-equinox/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java b/sca-java-2.x/branches/sca-equinox/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
index c19a0b4f74..c19a0b4f74 100644
--- a/branches/sca-equinox/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
diff --git a/branches/sca-equinox/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
index b7ccdbf8d1..b7ccdbf8d1 100644
--- a/branches/sca-equinox/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
diff --git a/branches/sca-equinox/itest/wires/src/main/resources/WireTest.composite b/sca-java-2.x/branches/sca-equinox/itest/wires/src/main/resources/WireTest.composite
index 8b764d0e7d..8b764d0e7d 100644
--- a/branches/sca-equinox/itest/wires/src/main/resources/WireTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/wires/src/main/resources/WireTest.composite
diff --git a/branches/sca-equinox/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
index 95f721cd8e..95f721cd8e 100644
--- a/branches/sca-equinox/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
diff --git a/branches/sca-equinox/itest/ws-void-args-return/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/ws-void-args-return/pom.xml
index a036182f3b..a036182f3b 100644
--- a/branches/sca-equinox/itest/ws-void-args-return/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/ws-void-args-return/pom.xml
diff --git a/branches/sca-equinox/itest/ws-void-args-return/src/main/java/voidtest/Bean.java b/sca-java-2.x/branches/sca-equinox/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
index 43e251369d..43e251369d 100644
--- a/branches/sca-equinox/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
diff --git a/branches/sca-equinox/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
index dc949b5191..dc949b5191 100644
--- a/branches/sca-equinox/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
diff --git a/branches/sca-equinox/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
index 4777f793e0..4777f793e0 100644
--- a/branches/sca-equinox/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
diff --git a/branches/sca-equinox/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java b/sca-java-2.x/branches/sca-equinox/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
index d549bccaf0..d549bccaf0 100644
--- a/branches/sca-equinox/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
diff --git a/branches/sca-equinox/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
index 1cdd094c50..1cdd094c50 100644
--- a/branches/sca-equinox/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
diff --git a/branches/sca-equinox/itest/ws-void-args-return/src/main/resources/voidtest.composite b/sca-java-2.x/branches/sca-equinox/itest/ws-void-args-return/src/main/resources/voidtest.composite
index 0f31c4cd2c..0f31c4cd2c 100644
--- a/branches/sca-equinox/itest/ws-void-args-return/src/main/resources/voidtest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/ws-void-args-return/src/main/resources/voidtest.composite
diff --git a/branches/sca-equinox/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
index eaaa67c22c..eaaa67c22c 100644
--- a/branches/sca-equinox/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
diff --git a/branches/sca-equinox/itest/wsdl-multiple/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/wsdl-multiple/pom.xml
index adef6e621d..adef6e621d 100644
--- a/branches/sca-equinox/itest/wsdl-multiple/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl-multiple/pom.xml
diff --git a/branches/sca-equinox/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
index 842ae0a692..842ae0a692 100644
--- a/branches/sca-equinox/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
diff --git a/branches/sca-equinox/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
index d2d898e9c4..d2d898e9c4 100644
--- a/branches/sca-equinox/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
diff --git a/branches/sca-equinox/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
index d4fbd434fe..d4fbd434fe 100644
--- a/branches/sca-equinox/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
index a46f763960..a46f763960 100644
--- a/branches/sca-equinox/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-equinox/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite b/sca-java-2.x/branches/sca-equinox/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
index 9d9ed57cc7..9d9ed57cc7 100644
--- a/branches/sca-equinox/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
diff --git a/branches/sca-equinox/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite b/sca-java-2.x/branches/sca-equinox/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
index 0c1dc5d353..0c1dc5d353 100644
--- a/branches/sca-equinox/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
diff --git a/branches/sca-equinox/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl b/sca-java-2.x/branches/sca-equinox/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
index ea2f93c3e6..ea2f93c3e6 100644
--- a/branches/sca-equinox/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
diff --git a/branches/sca-equinox/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl b/sca-java-2.x/branches/sca-equinox/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
index 1e50e146f2..1e50e146f2 100644
--- a/branches/sca-equinox/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
diff --git a/branches/sca-equinox/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
index 6a872faa17..6a872faa17 100644
--- a/branches/sca-equinox/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
diff --git a/branches/sca-equinox/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
index 5852f8d802..5852f8d802 100644
--- a/branches/sca-equinox/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
diff --git a/branches/sca-equinox/itest/wsdl/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/wsdl/pom.xml
index fd4cbd065d..fd4cbd065d 100644
--- a/branches/sca-equinox/itest/wsdl/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/pom.xml
diff --git a/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
index 265b11f7dd..265b11f7dd 100644
--- a/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
diff --git a/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
index f8c9c28f26..f8c9c28f26 100644
--- a/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
index f16d20689d..f16d20689d 100644
--- a/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
diff --git a/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
index cba6f2ee6c..cba6f2ee6c 100644
--- a/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
diff --git a/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
index 9f15be0236..9f15be0236 100644
--- a/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
diff --git a/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
index f174e1af07..f174e1af07 100644
--- a/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
diff --git a/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
index 4a5b7bceef..4a5b7bceef 100644
--- a/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
diff --git a/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
index e747eb041f..e747eb041f 100644
--- a/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
diff --git a/branches/sca-equinox/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
index c9076ebba6..c9076ebba6 100644
--- a/branches/sca-equinox/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/itest/wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-equinox/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
index d706517b76..d706517b76 100644
--- a/branches/sca-equinox/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-equinox/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
index 9d147dc013..9d147dc013 100644
--- a/branches/sca-equinox/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
diff --git a/branches/sca-equinox/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
index 7556e02b36..7556e02b36 100644
--- a/branches/sca-equinox/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
diff --git a/branches/sca-equinox/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
index e7031ff41c..e7031ff41c 100644
--- a/branches/sca-equinox/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
diff --git a/branches/sca-equinox/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
index 7a049ed7b0..7a049ed7b0 100644
--- a/branches/sca-equinox/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
diff --git a/branches/sca-equinox/itest/wsdl/src/main/resources/SDOWSDLTest.composite b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/resources/SDOWSDLTest.composite
index 62596ee62a..62596ee62a 100644
--- a/branches/sca-equinox/itest/wsdl/src/main/resources/SDOWSDLTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/resources/SDOWSDLTest.composite
diff --git a/branches/sca-equinox/itest/wsdl/src/main/resources/WSDLTest.composite b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/resources/WSDLTest.composite
index 2024578dae..2024578dae 100644
--- a/branches/sca-equinox/itest/wsdl/src/main/resources/WSDLTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/resources/WSDLTest.composite
diff --git a/branches/sca-equinox/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
index 73f9ed4bfc..73f9ed4bfc 100644
--- a/branches/sca-equinox/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-equinox/itest/wsdl/src/main/resources/wsdl/Hello.xsd b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/resources/wsdl/Hello.xsd
index 4fc5b10e7c..4fc5b10e7c 100644
--- a/branches/sca-equinox/itest/wsdl/src/main/resources/wsdl/Hello.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/resources/wsdl/Hello.xsd
diff --git a/branches/sca-equinox/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
index 1966acc957..1966acc957 100644
--- a/branches/sca-equinox/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
index 12441753fb..12441753fb 100644
--- a/branches/sca-equinox/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
diff --git a/branches/sca-equinox/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
index fd30d69c79..fd30d69c79 100644
--- a/branches/sca-equinox/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
diff --git a/branches/sca-equinox/itest/wsdl2java/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/wsdl2java/pom.xml
index 4220cc8ee4..4220cc8ee4 100644
--- a/branches/sca-equinox/itest/wsdl2java/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl2java/pom.xml
diff --git a/branches/sca-equinox/itest/wsdl2java/src/test/resources/AccountService.wsdl b/sca-java-2.x/branches/sca-equinox/itest/wsdl2java/src/test/resources/AccountService.wsdl
index 9e5650e7dd..9e5650e7dd 100644
--- a/branches/sca-equinox/itest/wsdl2java/src/test/resources/AccountService.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl2java/src/test/resources/AccountService.wsdl
diff --git a/branches/sca-equinox/itest/wsdl2java/src/test/resources/EchoService.wsdl b/sca-java-2.x/branches/sca-equinox/itest/wsdl2java/src/test/resources/EchoService.wsdl
index 50d580f299..50d580f299 100644
--- a/branches/sca-equinox/itest/wsdl2java/src/test/resources/EchoService.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl2java/src/test/resources/EchoService.wsdl
diff --git a/branches/sca-equinox/itest/wsdl2java/src/test/resources/EchoService.xsd b/sca-java-2.x/branches/sca-equinox/itest/wsdl2java/src/test/resources/EchoService.xsd
index 8069d4861f..8069d4861f 100644
--- a/branches/sca-equinox/itest/wsdl2java/src/test/resources/EchoService.xsd
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl2java/src/test/resources/EchoService.xsd
diff --git a/branches/sca-equinox/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl b/sca-java-2.x/branches/sca-equinox/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
index c44229c162..c44229c162 100644
--- a/branches/sca-equinox/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
diff --git a/branches/sca-equinox/itest/wsdlless/pom.xml b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/pom.xml
index d566685208..d566685208 100644
--- a/branches/sca-equinox/itest/wsdlless/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/pom.xml
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
index 5886ebc6ff..5886ebc6ff 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
index df658428fd..df658428fd 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
index d39df8c00e..d39df8c00e 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
index d4a06780c3..d4a06780c3 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
index 6dc46c60b5..6dc46c60b5 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
index 8471000152..8471000152 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
index 859c61a724..859c61a724 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
index e747eb041f..e747eb041f 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
index ca7c25f3fa..ca7c25f3fa 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
index 8b234599aa..8b234599aa 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
index 03984f7252..03984f7252 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
index 45bb697437..45bb697437 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
index 9342c8e6ee..9342c8e6ee 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
index 6c5ac96b67..6c5ac96b67 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
index ebaf33f568..ebaf33f568 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/java/service/AnObject.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/service/AnObject.java
index 65ba52f356..65ba52f356 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/java/service/AnObject.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/service/AnObject.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/java/service/MoreComplexObject.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/service/MoreComplexObject.java
index 69eba6701d..69eba6701d 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/java/service/MoreComplexObject.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/service/MoreComplexObject.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/java/service/SomeService.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/service/SomeService.java
index f6aaacb23a..f6aaacb23a 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/java/service/SomeService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/service/SomeService.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/java/service/SomeServiceImpl.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/service/SomeServiceImpl.java
index 39a2131024..39a2131024 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/java/service/SomeServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/java/service/SomeServiceImpl.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/resources/SDOWSDLTest.composite b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
index 16d3806318..16d3806318 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/resources/WSDLTest.composite b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/resources/WSDLTest.composite
index e69cdbc282..e69cdbc282 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/resources/WSDLTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/resources/WSDLTest.composite
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/resources/some.composite b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/resources/some.composite
index 1b099239d1..1b099239d1 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/resources/some.composite
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/resources/some.composite
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
index 73f9ed4bfc..73f9ed4bfc 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-equinox/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
index bc6fe0e89a..bc6fe0e89a 100644
--- a/branches/sca-equinox/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
index 33f541b21b..33f541b21b 100644
--- a/branches/sca-equinox/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
index 82bf7ce650..82bf7ce650 100644
--- a/branches/sca-equinox/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java
index 7c62287c57..7c62287c57 100644
--- a/branches/sca-equinox/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/AnObject.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/AnObject.java
index effeb3c701..effeb3c701 100644
--- a/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/AnObject.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/AnObject.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java
index 284e961788..284e961788 100644
--- a/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java
index 4113aa1a0a..4113aa1a0a 100644
--- a/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/GetUsingString.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/GetUsingString.java
index 532b948b47..532b948b47 100644
--- a/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/GetUsingString.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/GetUsingString.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java
index 82bfb2d2aa..82bfb2d2aa 100644
--- a/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java
index 61c7c6cb19..61c7c6cb19 100644
--- a/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java
index 1ba0c497d9..1ba0c497d9 100644
--- a/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/SomeService.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/SomeService.java
index 4a584a8da2..4a584a8da2 100644
--- a/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/SomeService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/SomeService.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java
index 44c2b67256..44c2b67256 100644
--- a/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java
diff --git a/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/package-info.java b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/package-info.java
index d7b3fef82e..d7b3fef82e 100644
--- a/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/package-info.java
+++ b/sca-java-2.x/branches/sca-equinox/itest/wsdlless/src/test/java/service/generated/package-info.java
diff --git a/branches/sca-equinox/modules/assembly-xml/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/assembly-xml/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/LICENSE
diff --git a/branches/sca-equinox/modules/assembly-xml/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/META-INF/MANIFEST.MF
index ba09044111..ba09044111 100644
--- a/branches/sca-equinox/modules/assembly-xml/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/assembly-xml/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/assembly-xml/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/NOTICE
diff --git a/branches/sca-equinox/modules/assembly-xml/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/pom.xml
index 37944b09a0..37944b09a0 100644
--- a/branches/sca-equinox/modules/assembly-xml/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/pom.xml
diff --git a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
index 8ac9386e19..8ac9386e19 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
index 629a0b6cae..629a0b6cae 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
index 166bba8757..166bba8757 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
index bdf2c98338..bdf2c98338 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
index 57d2330210..57d2330210 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
index 62ed95cb01..62ed95cb01 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
index b755684517..b755684517 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
index 5d9eccebde..5d9eccebde 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
index 3bf5a1173b..3bf5a1173b 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
index f04d27491f..f04d27491f 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
index d73ce5ab66..d73ce5ab66 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
index 2bc6086913..2bc6086913 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
index 890cf36b26..890cf36b26 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
index fc4e10654d..fc4e10654d 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 7a190dea9c..7a190dea9c 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 403c049b48..403c049b48 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-equinox/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index ecc34942f1..ecc34942f1 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-equinox/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
index 95edf89e30..95edf89e30 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/AnyElementReadWriteTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/AnyElementReadWriteTestCase.java
index 9300731007..9300731007 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/AnyElementReadWriteTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/AnyElementReadWriteTestCase.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
index 0fc36e6cad..0fc36e6cad 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
index d7836fbc3b..d7836fbc3b 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
index 4918271b1f..4918271b1f 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
index ba85769728..ba85769728 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAttributeTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAttributeTestCase.java
index 10012282fc..10012282fc 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAttributeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAttributeTestCase.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
index cc5421cd84..cc5421cd84 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
index cc8a88f3d5..cc8a88f3d5 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
index 1a100c25b1..1a100c25b1 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
index d01e304aad..d01e304aad 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestReadWriteUnknownElement.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestReadWriteUnknownElement.java
index 8dcc3256f4..8dcc3256f4 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestReadWriteUnknownElement.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestReadWriteUnknownElement.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
index c423df6f7d..c423df6f7d 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
index af25109de1..af25109de1 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
index ee281faa5d..ee281faa5d 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
index df760c1d1f..df760c1d1f 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
index dedd0d0660..dedd0d0660 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
index 85f6a39243..85f6a39243 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
index 072fe8fde1..072fe8fde1 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorExtended.composite b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorExtended.composite
index 3c69d0ed67..3c69d0ed67 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorExtended.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorExtended.composite
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
index d67ba3ec2b..d67ba3ec2b 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
index a313dd1e6d..a313dd1e6d 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
index 2719ee9162..2719ee9162 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
index 2a0bcf0f76..2a0bcf0f76 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
index 5091ff700b..5091ff700b 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
index d59e69209d..d59e69209d 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
index 7bc7ccdb83..7bc7ccdb83 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
index bcc8c54dc8..bcc8c54dc8 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
index b79cb6b7b7..b79cb6b7b7 100644
--- a/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
diff --git a/branches/sca-equinox/modules/assembly-xsd/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/LICENSE
index bfded7c6a9..bfded7c6a9 100644
--- a/branches/sca-equinox/modules/assembly-xsd/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/LICENSE
diff --git a/branches/sca-equinox/modules/assembly-xsd/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/META-INF/MANIFEST.MF
index 3fde8bc9bb..3fde8bc9bb 100644
--- a/branches/sca-equinox/modules/assembly-xsd/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/assembly-xsd/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-equinox/modules/assembly-xsd/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/NOTICE
diff --git a/branches/sca-equinox/modules/assembly-xsd/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/pom.xml
index f290413b04..f290413b04 100644
--- a/branches/sca-equinox/modules/assembly-xsd/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/pom.xml
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 69b2701e30..69b2701e30 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-all.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-all.xsd
index 82899ed8ed..82899ed8ed 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-all.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-all.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
index 26bedfcce5..26bedfcce5 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
index 6f64453635..6f64453635 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
index 02703402ef..02703402ef 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
index 3e92de193b..3e92de193b 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-contributions.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
index a22d8ac075..a22d8ac075 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-core.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-core.xsd
index a7ca0433f9..a7ca0433f9 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-core.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-core.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-definitions.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
index 0249882a92..0249882a92 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
index 87b443fb36..87b443fb36 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
index 99669bc672..99669bc672 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
index 6f1cf14a4b..6f1cf14a4b 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
index a7e781b18f..a7e781b18f 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
index f9d8171b8e..f9d8171b8e 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
index 1cf9fb3ea9..1cf9fb3ea9 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-web.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-web.xsd
index a1adf10fd9..a1adf10fd9 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-web.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-implementation-web.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
index 44f14e5ed5..44f14e5ed5 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
index 81f939bdb4..81f939bdb4 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
index c1fdfd8f3c..c1fdfd8f3c 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-policy.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-policy.xsd
index 2c4875f36c..2c4875f36c 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-policy.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca-policy.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca.xsd
index 88edad794c..88edad794c 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/sca.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
index c93a1d72de..c93a1d72de 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
index d0da5421ec..d0da5421ec 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
index ff48b97d7a..ff48b97d7a 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
index 7c79738898..7c79738898 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
index 6d5468b2f9..6d5468b2f9 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
index 26be6feae5..26be6feae5 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
index 821f323d73..821f323d73 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
index 4331da0439..4331da0439 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
index 1f6f9abb16..1f6f9abb16 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
index 4a06bdd36a..4a06bdd36a 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
index 1b5c8aece2..1b5c8aece2 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
index f8d437310e..f8d437310e 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
index f8ece54a07..f8ece54a07 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
index dd596821ea..dd596821ea 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
index e1723d65f0..e1723d65f0 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
index 0c0998595f..0c0998595f 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
index cdabb697aa..cdabb697aa 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
diff --git a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
index 032143bd13..032143bd13 100644
--- a/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
diff --git a/branches/sca-equinox/modules/assembly/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/assembly/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/assembly/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/LICENSE
diff --git a/branches/sca-equinox/modules/assembly/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/assembly/META-INF/MANIFEST.MF
index 11a82b4e4f..11a82b4e4f 100644
--- a/branches/sca-equinox/modules/assembly/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/assembly/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/assembly/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/assembly/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/NOTICE
diff --git a/branches/sca-equinox/modules/assembly/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/assembly/pom.xml
index 3faffefbfa..3faffefbfa 100644
--- a/branches/sca-equinox/modules/assembly/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/pom.xml
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
index b8487d95c5..b8487d95c5 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
index 05f0e60981..05f0e60981 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
index a9ef26bbb9..a9ef26bbb9 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
index 9ae511c07b..9ae511c07b 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
index 8a4fc6dfda..8a4fc6dfda 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
index 76511d351d..76511d351d 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
index f8b7d4d236..f8b7d4d236 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
index f49a653aa9..f49a653aa9 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
index 8e1943224c..8e1943224c 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
index 13d19b1757..13d19b1757 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
index ce40bc089b..ce40bc089b 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
index 65945692f1..65945692f1 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
index e1ea65ea39..e1ea65ea39 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
index 2c7b7c6b9e..2c7b7c6b9e 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
index d3fa80ba74..d3fa80ba74 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
index 7143f571f9..7143f571f9 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
index 8832597343..8832597343 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
index 9890bfed68..9890bfed68 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
index f9a62774e6..f9a62774e6 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
index 5dd256e3c4..5dd256e3c4 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.java
index 6b0c076ee5..6b0c076ee5 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
index ee63497fbe..ee63497fbe 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.java
index 93e6c4d630..93e6c4d630 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
index 3577a94d1e..3577a94d1e 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
index 720a6801a2..720a6801a2 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
index 5d15ce9938..5d15ce9938 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
index 947fcd4c7c..947fcd4c7c 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
index 98ff92f15b..98ff92f15b 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
index 683920da58..683920da58 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
index 2eb1bf21b0..2eb1bf21b0 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
index 2cf04277cd..2cf04277cd 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
index 0abfd13d10..0abfd13d10 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
index 020870cd34..020870cd34 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
index ee65e5746e..ee65e5746e 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java
index 97708f9ef5..97708f9ef5 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
index 7bac630d5b..7bac630d5b 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java
index 37ad8af0b3..37ad8af0b3 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
index d2fae4d24a..d2fae4d24a 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
index 8a18f74b2b..8a18f74b2b 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
index 5a2015f55e..5a2015f55e 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderExtensionPoint.java
index a2d6b34db5..a2d6b34db5 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderExtensionPoint.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultCompositeBuilderExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultCompositeBuilderExtensionPoint.java
index 8197bf2552..8197bf2552 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultCompositeBuilderExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultCompositeBuilderExtensionPoint.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.java
index 5d4055fc8e..5d4055fc8e 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
index 20a17e1bd0..20a17e1bd0 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.java
index e98be49551..e98be49551 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
index 3e45daaf49..3e45daaf49 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java
index b026eb0811..b026eb0811 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java
index 4016d02a36..4016d02a36 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java
index fa2c8cd292..fa2c8cd292 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java
index 734b373f11..734b373f11 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java
index 4ceb4bb079..4ceb4bb079 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
index 03f28a6f7a..03f28a6f7a 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java
index c725ea8947..c725ea8947 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java
index b9646acb20..b9646acb20 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingConfigurationBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingConfigurationBuilderImpl.java
index d322e4949a..d322e4949a 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingConfigurationBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingConfigurationBuilderImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
index 0c507c615e..0c507c615e 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
index 9846edc127..9846edc127 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
index 21e5192ae8..21e5192ae8 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
index 730c002468..730c002468 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
index cc84df86c3..cc84df86c3 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
index 05747a25b2..05747a25b2 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java
index a89f0d402f..a89f0d402f 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java
index 3786cdfa38..3786cdfa38 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java
index 6a8da7241a..6a8da7241a 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java
index 2fc5e571b2..2fc5e571b2 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java
index 3004a9f590..3004a9f590 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java
index 52e64c5067..52e64c5067 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java
index 944cf2cf36..944cf2cf36 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
index c0bc18dfaf..c0bc18dfaf 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
index e85aec8cea..e85aec8cea 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
index 0105d4af50..0105d4af50 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
index 0612f9ae0e..0612f9ae0e 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java
index 41a8b3f8ba..41a8b3f8ba 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
index b7c63dc2b4..b7c63dc2b4 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
index d0ee3832c5..d0ee3832c5 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
index 346764b1b4..346764b1b4 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
index 016a9a5b05..016a9a5b05 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
index 553e600bc9..553e600bc9 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
index 4082d81fdb..4082d81fdb 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
index 34429a6703..34429a6703 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
index e2e7b59896..e2e7b59896 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
index 488023090c..488023090c 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
index 0c78a2505f..0c78a2505f 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
index bbe665d52f..bbe665d52f 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
index a0ec95023a..a0ec95023a 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
index 4348e08fcb..4348e08fcb 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
index 6777a96982..6777a96982 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
index 1373ce511b..1373ce511b 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
index d5701df74e..d5701df74e 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
index 491c835246..491c835246 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.java
index ece51cbe9b..ece51cbe9b 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
index 5748abb07d..5748abb07d 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
index 9a7ca09e43..9a7ca09e43 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
index aa75922489..aa75922489 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
index 0c1051199f..0c1051199f 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
index 1800222bfb..1800222bfb 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
index 8d745cb7e1..8d745cb7e1 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
index 1a7abc8564..1a7abc8564 100644
--- a/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
diff --git a/branches/sca-equinox/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
index 859c4bde4b..859c4bde4b 100644
--- a/branches/sca-equinox/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
diff --git a/branches/sca-equinox/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
index 8dbff76ad9..8dbff76ad9 100644
--- a/branches/sca-equinox/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
diff --git a/branches/sca-equinox/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
index 9fbabd0c3f..9fbabd0c3f 100644
--- a/branches/sca-equinox/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
diff --git a/branches/sca-equinox/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint
index 693834e23d..693834e23d 100644
--- a/branches/sca-equinox/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint
diff --git a/branches/sca-equinox/modules/assembly/src/main/resources/assembly-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/resources/assembly-validation-messages.properties
index 6aeda18aab..6aeda18aab 100644
--- a/branches/sca-equinox/modules/assembly/src/main/resources/assembly-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/resources/assembly-validation-messages.properties
diff --git a/branches/sca-equinox/modules/assembly/src/main/resources/assembly-validation-messages_it.properties b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/resources/assembly-validation-messages_it.properties
index b94d37ba2d..b94d37ba2d 100644
--- a/branches/sca-equinox/modules/assembly/src/main/resources/assembly-validation-messages_it.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/main/resources/assembly-validation-messages_it.properties
diff --git a/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
index e73119204d..e73119204d 100644
--- a/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
diff --git a/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
index 5e0a2335d1..5e0a2335d1 100644
--- a/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
diff --git a/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
index 19702954c9..19702954c9 100644
--- a/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
diff --git a/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
index dbe0cb8225..dbe0cb8225 100644
--- a/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
diff --git a/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
index ee6b95edc9..ee6b95edc9 100644
--- a/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
diff --git a/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
index d94a7e93a3..d94a7e93a3 100644
--- a/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
diff --git a/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
index faad1736ac..faad1736ac 100644
--- a/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
diff --git a/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
index 82b1fd8665..82b1fd8665 100644
--- a/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/LICENSE
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/META-INF/MANIFEST.MF
index 8e52c6f2a8..8e52c6f2a8 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/NOTICE
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/pom.xml
index be24ff561e..be24ff561e 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/pom.xml
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
index 7356cd0d2a..7356cd0d2a 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
index cc351442e7..cc351442e7 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
index b457840922..b457840922 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
index dafcf57311..dafcf57311 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
index 7cf087bb41..7cf087bb41 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
index 2651324ccf..2651324ccf 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
index 62fde86122..62fde86122 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
index f2b1d1f72b..f2b1d1f72b 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
index e1d470f5a3..e1d470f5a3 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 1b9052299c..1b9052299c 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
index 4e586a5510..4e586a5510 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
index eaa2bc4a97..eaa2bc4a97 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
index ffe8a03f20..ffe8a03f20 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
index 08c1ed7ac9..08c1ed7ac9 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomTestCaseUtils.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomTestCaseUtils.java
index 6beed6881f..6beed6881f 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomTestCaseUtils.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomTestCaseUtils.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
index 5b4d995dc1..5b4d995dc1 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
index 383344f3cb..383344f3cb 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
index 7ec9c1480e..7ec9c1480e 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
index bc32b91367..bc32b91367 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
index 3e5705b14c..3e5705b14c 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
index db66b00a50..db66b00a50 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
index a881f2dd0a..a881f2dd0a 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTest.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTest.java
index bda697bcca..bda697bcca 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTest.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTest.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTest.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTest.java
index 4c6c2a04c2..4c6c2a04c2 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTest.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTest.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTest.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTest.java
index 93cbf29766..93cbf29766 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTest.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTest.java
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
index a2c50f872e..a2c50f872e 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
index 60097ee0f7..60097ee0f7 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
diff --git a/branches/sca-equinox/modules/binding-atom/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-atom/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/binding-atom/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom/LICENSE
diff --git a/branches/sca-equinox/modules/binding-atom/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-atom/META-INF/MANIFEST.MF
index 4b58729aa2..4b58729aa2 100644
--- a/branches/sca-equinox/modules/binding-atom/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-atom/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-atom/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/binding-atom/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom/NOTICE
diff --git a/branches/sca-equinox/modules/binding-atom/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-atom/pom.xml
index 413675787d..413675787d 100644
--- a/branches/sca-equinox/modules/binding-atom/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom/pom.xml
diff --git a/branches/sca-equinox/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
index 807d6a8971..807d6a8971 100644
--- a/branches/sca-equinox/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
diff --git a/branches/sca-equinox/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
index 6e5623e1a2..6e5623e1a2 100644
--- a/branches/sca-equinox/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
diff --git a/branches/sca-equinox/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
index ea06625d34..ea06625d34 100644
--- a/branches/sca-equinox/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
diff --git a/branches/sca-equinox/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
index 8b0b9451fb..8b0b9451fb 100644
--- a/branches/sca-equinox/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
diff --git a/branches/sca-equinox/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
index a8117db8f3..a8117db8f3 100644
--- a/branches/sca-equinox/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
diff --git a/branches/sca-equinox/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 52e0e916f5..52e0e916f5 100644
--- a/branches/sca-equinox/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
index 1477554cd1..1477554cd1 100644
--- a/branches/sca-equinox/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/LICENSE
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/META-INF/MANIFEST.MF
index 88a38c8dc1..88a38c8dc1 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/NOTICE
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/pom.xml
index 199b3f8528..199b3f8528 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/pom.xml
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaBindingProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaBindingProviderFactory.java
index aa1669045b..aa1669045b 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaBindingProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaBindingProviderFactory.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaInvoker.java
index 2e3d72f2dc..2e3d72f2dc 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaInvoker.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaReferenceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaReferenceBindingProvider.java
index e177e1912f..e177e1912f 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaReferenceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaReferenceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaServiceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaServiceBindingProvider.java
index fd4d38a6f5..fd4d38a6f5 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaServiceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaServiceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/CorbaException.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/CorbaException.java
index b3569e43b9..b3569e43b9 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/CorbaException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/CorbaException.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/RequestConfigurationException.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/RequestConfigurationException.java
index a554f56035..a554f56035 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/RequestConfigurationException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/RequestConfigurationException.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaArray.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaArray.java
index 823db1e748..823db1e748 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaArray.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaArray.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElement.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElement.java
index feb6627e25..feb6627e25 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElement.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElement.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElementType.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElementType.java
index 1e7a0087e0..1e7a0087e0 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElementType.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElementType.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaRequest.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaRequest.java
index e7d0b8b91b..e7d0b8b91b 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaRequest.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaRequest.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaResponse.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaResponse.java
index 6a01c70a38..6a01c70a38 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaResponse.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaResponse.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceInstanceCreator.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceInstanceCreator.java
index 2828e09cc7..2828e09cc7 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceInstanceCreator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceInstanceCreator.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceMethodInterceptor.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceMethodInterceptor.java
index c5c98ab27c..c5c98ab27c 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceMethodInterceptor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceMethodInterceptor.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/ComponentInvocationProxy.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/ComponentInvocationProxy.java
index b88c097008..b88c097008 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/ComponentInvocationProxy.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/ComponentInvocationProxy.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/DynaCorbaServant.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/DynaCorbaServant.java
index d8524eaee9..d8524eaee9 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/DynaCorbaServant.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/DynaCorbaServant.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationException.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationException.java
index 57e2fae9f4..57e2fae9f4 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationException.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationProxy.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationProxy.java
index 2e2066802a..2e2066802a 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationProxy.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationProxy.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/OperationTypes.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/OperationTypes.java
index 766048ac64..766048ac64 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/OperationTypes.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/OperationTypes.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/AnnotationAttributes.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/AnnotationAttributes.java
index ab7371bbe8..ab7371bbe8 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/AnnotationAttributes.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/AnnotationAttributes.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/NodeType.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/NodeType.java
index 706a44406b..706a44406b 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/NodeType.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/NodeType.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTree.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTree.java
index d4207ab735..d4207ab735 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTree.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTree.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeCreator.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeCreator.java
index 1ba4002303..1ba4002303 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeCreator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeCreator.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeNode.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeNode.java
index 009eac3377..009eac3377 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeNode.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeNode.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/UnionAttributes.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/UnionAttributes.java
index 34bee2a0e4..34bee2a0e4 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/UnionAttributes.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/UnionAttributes.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ArrayTypeHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ArrayTypeHelper.java
index 35a1e539d9..35a1e539d9 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ArrayTypeHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ArrayTypeHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/BooleanTypeHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/BooleanTypeHelper.java
index bbc2012a38..bbc2012a38 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/BooleanTypeHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/BooleanTypeHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ByteTypeHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ByteTypeHelper.java
index 761cc5d62c..761cc5d62c 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ByteTypeHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ByteTypeHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/CharTypeHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/CharTypeHelper.java
index b2d2afd011..b2d2afd011 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/CharTypeHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/CharTypeHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/DoubleTypeHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/DoubleTypeHelper.java
index f667123bb7..f667123bb7 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/DoubleTypeHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/DoubleTypeHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/EnumTypeHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/EnumTypeHelper.java
index 5661232e1e..5661232e1e 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/EnumTypeHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/EnumTypeHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/FloatTypeHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/FloatTypeHelper.java
index 7c39725012..7c39725012 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/FloatTypeHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/FloatTypeHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/IntTypeHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/IntTypeHelper.java
index e903b59e50..e903b59e50 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/IntTypeHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/IntTypeHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/LongTypeHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/LongTypeHelper.java
index 79d3c0cbc8..79d3c0cbc8 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/LongTypeHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/LongTypeHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ReferenceTypeHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ReferenceTypeHelper.java
index c89a25401d..c89a25401d 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ReferenceTypeHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ReferenceTypeHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/SequenceTypeHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/SequenceTypeHelper.java
index 911c787b11..911c787b11 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/SequenceTypeHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/SequenceTypeHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ShortTypeHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ShortTypeHelper.java
index f4cdabc8e2..f4cdabc8e2 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ShortTypeHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ShortTypeHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StringTypeHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StringTypeHelper.java
index 5a4fcba221..5a4fcba221 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StringTypeHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StringTypeHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StructTypeHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StructTypeHelper.java
index 1fc729b926..1fc729b926 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StructTypeHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StructTypeHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelper.java
index 0f1f973f49..0f1f973f49 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelpersProxy.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelpersProxy.java
index ded82bf12e..ded82bf12e 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelpersProxy.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelpersProxy.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/UnionTypeHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/UnionTypeHelper.java
index df2e833fcd..df2e833fcd 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/UnionTypeHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/UnionTypeHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/Utils.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/Utils.java
index 7ccd70f69e..7ccd70f69e 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/Utils.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/Utils.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/MethodFinder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/MethodFinder.java
index f9facac0cc..f9facac0cc 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/MethodFinder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/MethodFinder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/OperationMapper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/OperationMapper.java
index 414e50abf4..414e50abf4 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/OperationMapper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/OperationMapper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 9855dec8af..9855dec8af 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
index 38891340f9..38891340f9 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
index 1b1754f347..1b1754f347 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
index f0dccd9e7e..f0dccd9e7e 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
index 6975c62ddb..6975c62ddb 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
index 4767728db7..4767728db7 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
index 962a00d002..962a00d002 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java
index f4ca1577f5..f4ca1577f5 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java
index d10bc498b7..d10bc498b7 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java
index 98987c1252..98987c1252 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java
index d80adb476a..d80adb476a 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java
index 9f520f3c5d..9f520f3c5d 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java
index 11c22f1d72..11c22f1d72 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java
index ca9233c77f..ca9233c77f 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java
index 1a1a36fd16..1a1a36fd16 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java
index 7cef0ea189..7cef0ea189 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java
index 5498104905..5498104905 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java
index 72beff0537..72beff0537 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java
index 747337597c..747337597c 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java
index 2b239deadc..2b239deadc 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java
index 6427d9d200..6427d9d200 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java
index 94683e0327..94683e0327 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java
index e4cac28e4f..e4cac28e4f 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
index 38e29c0d63..38e29c0d63 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java
index e3c28f8b91..e3c28f8b91 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java
index 775cac8e16..775cac8e16 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java
index 32cd9c8df6..32cd9c8df6 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java
index 3f73557952..3f73557952 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java
index a6160a7643..a6160a7643 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java
index 6afa6bc806..6afa6bc806 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java
index bab0c27f77..bab0c27f77 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java
index 514627ff4b..514627ff4b 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java
index 4629ca9cff..4629ca9cff 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java
index aa480f93ac..aa480f93ac 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java
index 5ed36ca19b..5ed36ca19b 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java
index ec1cfadd1e..ec1cfadd1e 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java
index 29865ace06..29865ace06 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java
index d7839ec4db..d7839ec4db 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java
index c47d63208f..c47d63208f 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java
index f767e8c11a..f767e8c11a 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java
index e7cbb4b8ca..e7cbb4b8ca 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java
index 5d27f9969c..5d27f9969c 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java
index ab01c66675..ab01c66675 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java
index f4ea58e55e..f4ea58e55e 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java
index 82609a36c1..82609a36c1 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java
index 1389bd33d9..1389bd33d9 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java
index a73e252129..a73e252129 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java
index 65ce051129..65ce051129 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
index fde204edf8..fde204edf8 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
index 71b4fbbdb6..71b4fbbdb6 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
index d758a560a9..d758a560a9 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
index 464c2ccbc3..464c2ccbc3 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
index c053f12a02..c053f12a02 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
index 566689960e..566689960e 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
index 6564957081..6564957081 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
index 26669de95a..26669de95a 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
index 5a140f5ecc..5a140f5ecc 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
index 2a8fe73417..2a8fe73417 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
index 63e3926dd2..63e3926dd2 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
index a8231236eb..a8231236eb 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
index ca86420240..ca86420240 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
index 2a8898d38f..2a8898d38f 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
index bed30e00ca..bed30e00ca 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
index 73dbd6c198..73dbd6c198 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
index 8f524ffeb1..8f524ffeb1 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
index 3231a136dc..3231a136dc 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
index 28d3ecdc91..28d3ecdc91 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
index 29ff2edfd2..29ff2edfd2 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
index b8aea13c8d..b8aea13c8d 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
index 0bacb6746a..0bacb6746a 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
index c6e8c2a4e0..c6e8c2a4e0 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
index 079cc6e899..079cc6e899 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
index b444ce68d8..b444ce68d8 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
index 0b08e1fb67..0b08e1fb67 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
index a87534f88b..a87534f88b 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
index e219dfa338..e219dfa338 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
index c0bc0d6ebd..c0bc0d6ebd 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
index ad47595ddf..ad47595ddf 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
index f3d96e8fd7..f3d96e8fd7 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
index cb0ab8bcfd..cb0ab8bcfd 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
index 0bde1e701c..0bde1e701c 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
index 19b2942cfe..19b2942cfe 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
index 8bb5a9c69d..8bb5a9c69d 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
index dc89e71092..dc89e71092 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
index 7b71aa0a9f..7b71aa0a9f 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
index 513bab37cc..513bab37cc 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
index c1d06e2ba9..c1d06e2ba9 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
index f9ad7b77ac..f9ad7b77ac 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
index cfb292fc01..cfb292fc01 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
index 02f46a7d85..02f46a7d85 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
index 505aa3f026..505aa3f026 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
index 5cbaa109ee..5cbaa109ee 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
index 2f792888fb..2f792888fb 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
index 8b2ccc1f73..8b2ccc1f73 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
index 67e224f0be..67e224f0be 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
index 5d4adfba2d..5d4adfba2d 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
index c7d86d9179..c7d86d9179 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
index 09b2b85c6a..09b2b85c6a 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
index e88b1e06c4..e88b1e06c4 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
index d3f996c5b4..d3f996c5b4 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
index 7c58d47f7c..7c58d47f7c 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
index 5be5a65c43..5be5a65c43 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
index a40d5fa8de..a40d5fa8de 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
index 76f99408f2..76f99408f2 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
index d7594b0815..d7594b0815 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
index e9fbcccc36..e9fbcccc36 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
diff --git a/branches/sca-equinox/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/branches/sca-equinox/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/branches/sca-equinox/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/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
diff --git a/branches/sca-equinox/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/branches/sca-equinox/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/branches/sca-equinox/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/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
index ec4526cebf..ec4526cebf 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
index 56ab28f0be..56ab28f0be 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
index 73a10d3b7f..73a10d3b7f 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
index c5c1e87756..c5c1e87756 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
index 3e45568f01..3e45568f01 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
index bdbf9d995b..bdbf9d995b 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java
index ba1a5c0a51..ba1a5c0a51 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java
index 7c33b1d449..7c33b1d449 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java
index d0ebff5fec..d0ebff5fec 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java
index 6e4204b9b7..6e4204b9b7 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java
index cb3b6842c3..cb3b6842c3 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java
index 0c9de5bb31..0c9de5bb31 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java
index 8746eb7f9b..8746eb7f9b 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java
index 6d124b0485..6d124b0485 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java
index 8cf66e2fac..8cf66e2fac 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java
index 5f361512f0..5f361512f0 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java
index adc81ea5a2..adc81ea5a2 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java
index 4f6d0085af..4f6d0085af 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java
index 98462bbabe..98462bbabe 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java
index 994ed6aea3..994ed6aea3 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java
index d68d903375..d68d903375 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java
index d4f8b0e6fa..d4f8b0e6fa 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java
index a514b5e222..a514b5e222 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java
index 452dee8d95..452dee8d95 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java
index 85ca3798f4..85ca3798f4 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java
index d8cdf1835a..d8cdf1835a 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java
index bb72fdbbf3..bb72fdbbf3 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java
index 606d333bb3..606d333bb3 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java
index 0ff9540502..0ff9540502 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java
index 912bd16f9b..912bd16f9b 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java
index 79f7959c72..79f7959c72 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java
index 495a614d84..495a614d84 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java
index 11cfc82ac2..11cfc82ac2 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java
index e0e56d1017..e0e56d1017 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java
index c706661eaa..c706661eaa 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java
index c9a31deb27..c9a31deb27 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java
index a6b55b8bae..a6b55b8bae 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java
index e06a078a93..e06a078a93 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java
index 0aec4d278d..0aec4d278d 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java
index d9bde48a5a..d9bde48a5a 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java
index 9ff94f8313..9ff94f8313 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java
index fd789e19cb..fd789e19cb 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java
index 2e205f1d0f..2e205f1d0f 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java
index 52386aeef7..52386aeef7 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java
index b7fbb69627..b7fbb69627 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java
index dda8203f79..dda8203f79 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java
index 20700a0392..20700a0392 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java
index 213c7fbd7c..213c7fbd7c 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java
index 92e18741ae..92e18741ae 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
index 153268983f..153268983f 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java
index 7ebc3fce85..7ebc3fce85 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java
index 2c5a0d8159..2c5a0d8159 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
index d691705955..d691705955 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
index 90551ec25d..90551ec25d 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
index 6fc5f9398e..6fc5f9398e 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
index 696705aa74..696705aa74 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl
index 0f4ed03b4e..0f4ed03b4e 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/resources/enums.idl b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/resources/enums.idl
index 2e4e829b0f..2e4e829b0f 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/resources/enums.idl
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/resources/enums.idl
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/resources/exceptions.idl b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/resources/exceptions.idl
index b34ec46458..b34ec46458 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/resources/exceptions.idl
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/resources/exceptions.idl
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/resources/general_tests.idl b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/resources/general_tests.idl
index db253338c3..db253338c3 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/resources/general_tests.idl
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/resources/general_tests.idl
diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/resources/references.idl b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/resources/references.idl
index 72b58806e6..72b58806e6 100644
--- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/resources/references.idl
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba-runtime/src/test/resources/references.idl
diff --git a/branches/sca-equinox/modules/binding-corba/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-corba/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/binding-corba/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba/LICENSE
diff --git a/branches/sca-equinox/modules/binding-corba/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-corba/META-INF/MANIFEST.MF
index 2a00b9501b..2a00b9501b 100644
--- a/branches/sca-equinox/modules/binding-corba/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-corba/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-corba/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/binding-corba/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba/NOTICE
diff --git a/branches/sca-equinox/modules/binding-corba/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-corba/pom.xml
index 87da0b6ec5..87da0b6ec5 100644
--- a/branches/sca-equinox/modules/binding-corba/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba/pom.xml
diff --git a/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
index 8ccce730cf..8ccce730cf 100644
--- a/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
diff --git a/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.java
index 67e3bdcf74..67e3bdcf74 100644
--- a/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.java
diff --git a/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.java
index cecb4fb567..cecb4fb567 100644
--- a/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.java
diff --git a/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java
index 54e98d4117..54e98d4117 100644
--- a/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java
diff --git a/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
index 930a8d39d9..930a8d39d9 100644
--- a/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
diff --git a/branches/sca-equinox/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory
index 57959840d4..57959840d4 100644
--- a/branches/sca-equinox/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory
diff --git a/branches/sca-equinox/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 71d14bc077..71d14bc077 100644
--- a/branches/sca-equinox/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/LICENSE
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
index 464fe479a3..464fe479a3 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/NOTICE
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/pom.xml
index 672b669bf6..672b669bf6 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/pom.xml
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
index c65868c23b..c65868c23b 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
index 82554a1c8f..82554a1c8f 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
index de8090c45b..de8090c45b 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
index 1be4a98a48..1be4a98a48 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
index 3ff0ed552a..3ff0ed552a 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
index f9aa9ffa22..f9aa9ffa22 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
index 9247c1d3db..9247c1d3db 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
index a6ea583d0b..a6ea583d0b 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
index 2a02bf0d08..2a02bf0d08 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
index d41dbd0a0f..d41dbd0a0f 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
index 0b97f42746..0b97f42746 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
index d34cfe1b16..d34cfe1b16 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
index b699a02d1d..b699a02d1d 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
index e60e526e01..e60e526e01 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
index 5e7d6761d9..5e7d6761d9 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
index e7ea7c9077..e7ea7c9077 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
index 346b7c5cf6..346b7c5cf6 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index a89f711da9..a89f711da9 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties
index 28477dd3ac..28477dd3ac 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java
index 28dafedaeb..28dafedaeb 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/account/Customer.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/account/Customer.java
index 49ece71f7a..49ece71f7a 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/account/Customer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/account/Customer.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java
index 3d3f785a50..3d3f785a50 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java
index 7cefba530a..7cefba530a 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java
index 799bcaa672..799bcaa672 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
index e480e648d9..e480e648d9 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
index 0d02be3b95..0d02be3b95 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
index 87616330dc..87616330dc 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
index 48e87fb6d1..48e87fb6d1 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
index 66b3feb458..66b3feb458 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/src/test/resources/account/account.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/test/resources/account/account.composite
index 14f77eed08..14f77eed08 100644
--- a/branches/sca-equinox/modules/binding-ejb-runtime/src/test/resources/account/account.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb-runtime/src/test/resources/account/account.composite
diff --git a/branches/sca-equinox/modules/binding-ejb/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/binding-ejb/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/LICENSE
diff --git a/branches/sca-equinox/modules/binding-ejb/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/META-INF/MANIFEST.MF
index 33493eee71..33493eee71 100644
--- a/branches/sca-equinox/modules/binding-ejb/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-ejb/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/binding-ejb/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/NOTICE
diff --git a/branches/sca-equinox/modules/binding-ejb/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/pom.xml
index 1ed14e3e5c..1ed14e3e5c 100644
--- a/branches/sca-equinox/modules/binding-ejb/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/pom.xml
diff --git a/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
index 271a113429..271a113429 100644
--- a/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
diff --git a/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
index 6e2c8d358f..6e2c8d358f 100644
--- a/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
diff --git a/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
index 13b069a6bb..13b069a6bb 100644
--- a/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
diff --git a/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
index e84de86eca..e84de86eca 100644
--- a/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
diff --git a/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
index 4abed80aa3..4abed80aa3 100644
--- a/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
diff --git a/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
index 0320142dde..0320142dde 100644
--- a/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
diff --git a/branches/sca-equinox/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory
index c445a82ecb..c445a82ecb 100644
--- a/branches/sca-equinox/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory
diff --git a/branches/sca-equinox/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 82e85ef067..82e85ef067 100644
--- a/branches/sca-equinox/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties
index 28477dd3ac..28477dd3ac 100644
--- a/branches/sca-equinox/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/LICENSE
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
index 91b9519b28..91b9519b28 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/NOTICE
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml
index ee45ff57ac..ee45ff57ac 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java
index 5400e0b90f..5400e0b90f 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java
index 774dc59269..774dc59269 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java
index 91e3616ad9..91e3616ad9 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java
index 460aa81378..460aa81378 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java
index 4fa89fc634..4fa89fc634 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java
index 9de4772a70..9de4772a70 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java
index 3d476df764..3d476df764 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java
index c20e44f7da..c20e44f7da 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataServiceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataServiceBindingProvider.java
index 10faf74371..10faf74371 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataServiceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataServiceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 5e380eb4e0..5e380eb4e0 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/resources/tuscany-binding-gdata.xsd b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/main/resources/tuscany-binding-gdata.xsd
index 5148e2ef2d..5148e2ef2d 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/resources/tuscany-binding-gdata.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/main/resources/tuscany-binding-gdata.xsd
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java
index 50a3ec3886..50a3ec3886 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java
index e4d502357d..e4d502357d 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClient.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClient.java
index 7aa0a8961c..7aa0a8961c 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClient.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClient.java
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java
index a2b1da894d..a2b1da894d 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java
index 3c11fb70b9..3c11fb70b9 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java
index 902d251200..902d251200 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java
index 749dd41710..749dd41710 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java
index cab7196a69..cab7196a69 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java
index a9b12c3d32..a9b12c3d32 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java
index 141f641575..141f641575 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/log4j.properties b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/log4j.properties
index 33eaf11c1f..33eaf11c1f 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/log4j.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/log4j.properties
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite
index a7941a2056..a7941a2056 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite
index 078873c44f..078873c44f 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite
index 7e0c925482..7e0c925482 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite
index bc1ea7a8a9..bc1ea7a8a9 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Provider.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Provider.composite
index a4cf00dc84..a4cf00dc84 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Provider.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Provider.composite
diff --git a/branches/sca-equinox/modules/binding-gdata/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata/LICENSE
index d645695673..d645695673 100644
--- a/branches/sca-equinox/modules/binding-gdata/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata/LICENSE
diff --git a/branches/sca-equinox/modules/binding-gdata/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata/META-INF/MANIFEST.MF
index 7a9b95a055..7a9b95a055 100644
--- a/branches/sca-equinox/modules/binding-gdata/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-gdata/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata/NOTICE
index a86f96ba80..a86f96ba80 100644
--- a/branches/sca-equinox/modules/binding-gdata/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata/NOTICE
diff --git a/branches/sca-equinox/modules/binding-gdata/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata/pom.xml
index 3cfe0bbe0b..3cfe0bbe0b 100644
--- a/branches/sca-equinox/modules/binding-gdata/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata/pom.xml
diff --git a/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java
index a3a0b834cd..a3a0b834cd 100644
--- a/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java
diff --git a/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java
index 5cfc688dcb..5cfc688dcb 100644
--- a/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java
diff --git a/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java
index 87f3597248..87f3597248 100644
--- a/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java
diff --git a/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java
index 409fd497ac..409fd497ac 100644
--- a/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java
diff --git a/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/xml/GdataBindingProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/xml/GdataBindingProcessor.java
index 660b96243e..660b96243e 100644
--- a/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/xml/GdataBindingProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/xml/GdataBindingProcessor.java
diff --git a/branches/sca-equinox/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GdataBindingFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GdataBindingFactory
index 21688a62a6..21688a62a6 100644
--- a/branches/sca-equinox/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GdataBindingFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GdataBindingFactory
diff --git a/branches/sca-equinox/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index e7c37c44fe..e7c37c44fe 100644
--- a/branches/sca-equinox/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/binding-http-runtime/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/LICENSE
diff --git a/branches/sca-equinox/modules/binding-http-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/META-INF/MANIFEST.MF
index edd51d7c48..edd51d7c48 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-http-runtime/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/NOTICE
diff --git a/branches/sca-equinox/modules/binding-http-runtime/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/pom.xml
index d007603827..d007603827 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/pom.xml
diff --git a/branches/sca-equinox/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
index e969749358..e969749358 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
diff --git a/branches/sca-equinox/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
index eb496f2421..eb496f2421 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
diff --git a/branches/sca-equinox/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
index e20d420d49..e20d420d49 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
diff --git a/branches/sca-equinox/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
index 0a8f74edca..0a8f74edca 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
index 03b91c4db2..03b91c4db2 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
diff --git a/branches/sca-equinox/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 0fa8d44c08..0fa8d44c08 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java
index 50022e9663..50022e9663 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java
diff --git a/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
index 601483be8a..601483be8a 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
diff --git a/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java
index 1d6efea2a1..1d6efea2a1 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java
diff --git a/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java
index 5728899ebe..5728899ebe 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java
diff --git a/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java
index a3fce376f3..a3fce376f3 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java
diff --git a/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
index 333bacbab3..333bacbab3 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
diff --git a/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java
index ed846c1127..ed846c1127 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java
diff --git a/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
index 11945c8cd1..11945c8cd1 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
diff --git a/branches/sca-equinox/modules/binding-http-runtime/src/test/resources/content/test.html b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/src/test/resources/content/test.html
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/test/resources/content/test.html
diff --git a/branches/sca-equinox/modules/binding-http-runtime/src/test/resources/test.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/test/resources/test.composite
index 62c4af4e22..62c4af4e22 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/src/test/resources/test.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/test/resources/test.composite
diff --git a/branches/sca-equinox/modules/binding-http-runtime/src/test/resources/testCache.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/test/resources/testCache.composite
index d805402c4f..d805402c4f 100644
--- a/branches/sca-equinox/modules/binding-http-runtime/src/test/resources/testCache.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http-runtime/src/test/resources/testCache.composite
diff --git a/branches/sca-equinox/modules/binding-http/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-http/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/binding-http/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http/LICENSE
diff --git a/branches/sca-equinox/modules/binding-http/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-http/META-INF/MANIFEST.MF
index e9b65ddbac..e9b65ddbac 100644
--- a/branches/sca-equinox/modules/binding-http/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-http/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-http/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/binding-http/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http/NOTICE
diff --git a/branches/sca-equinox/modules/binding-http/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-http/pom.xml
index 49949c6410..49949c6410 100644
--- a/branches/sca-equinox/modules/binding-http/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http/pom.xml
diff --git a/branches/sca-equinox/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/CacheContext.java b/sca-java-2.x/branches/sca-equinox/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/CacheContext.java
index aa80b7a40b..aa80b7a40b 100644
--- a/branches/sca-equinox/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/CacheContext.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/CacheContext.java
diff --git a/branches/sca-equinox/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java b/sca-java-2.x/branches/sca-equinox/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
index 6192b92dfe..6192b92dfe 100644
--- a/branches/sca-equinox/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
diff --git a/branches/sca-equinox/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
index e66896c68e..e66896c68e 100644
--- a/branches/sca-equinox/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
diff --git a/branches/sca-equinox/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
index 678cd1a426..678cd1a426 100644
--- a/branches/sca-equinox/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
diff --git a/branches/sca-equinox/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
index 69d2bd7d25..69d2bd7d25 100644
--- a/branches/sca-equinox/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
diff --git a/branches/sca-equinox/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
index 44da6b166c..44da6b166c 100644
--- a/branches/sca-equinox/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
diff --git a/branches/sca-equinox/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index cc07784cb7..cc07784cb7 100644
--- a/branches/sca-equinox/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/LICENSE
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF
index 73da347ab4..73da347ab4 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/NOTICE
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/pom.xml
index 89527542f5..89527542f5 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/pom.xml
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
index 398b364c13..398b364c13 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
index 51166e5b30..51166e5b30 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java
index 07a617bc6c..07a617bc6c 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
index 0fe28e5a0f..0fe28e5a0f 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
index 901eb42650..901eb42650 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
index 9c391bacf9..9c391bacf9 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
index 821b9d7873..821b9d7873 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
index 09fe7310e6..09fe7310e6 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
index 6cf69abe5b..6cf69abe5b 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
index 477ec2c2ae..477ec2c2ae 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
index 32d024ec32..32d024ec32 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java
index 6e5556df01..6e5556df01 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 4cb8e90b7a..4cb8e90b7a 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index fb80362457..fb80362457 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 515da3144a..515da3144a 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index a8808c1bd1..a8808c1bd1 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/src/test/resources/simple/client.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/test/resources/simple/client.composite
index dcea428493..dcea428493 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/src/test/resources/simple/client.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/test/resources/simple/client.composite
diff --git a/branches/sca-equinox/modules/binding-jms-runtime/src/test/resources/simple/service.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/test/resources/simple/service.composite
index 44b7b29610..44b7b29610 100644
--- a/branches/sca-equinox/modules/binding-jms-runtime/src/test/resources/simple/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms-runtime/src/test/resources/simple/service.composite
diff --git a/branches/sca-equinox/modules/binding-jms/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/binding-jms/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/LICENSE
diff --git a/branches/sca-equinox/modules/binding-jms/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/META-INF/MANIFEST.MF
index 0e2a393734..0e2a393734 100644
--- a/branches/sca-equinox/modules/binding-jms/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-jms/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/binding-jms/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/NOTICE
diff --git a/branches/sca-equinox/modules/binding-jms/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/pom.xml
index bf21200d81..bf21200d81 100644
--- a/branches/sca-equinox/modules/binding-jms/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/pom.xml
diff --git a/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
index ddc41a463a..ddc41a463a 100644
--- a/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
diff --git a/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingException.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingException.java
index 74f030ca21..74f030ca21 100644
--- a/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingException.java
diff --git a/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingFactory.java
index d96dadf8c5..d96dadf8c5 100644
--- a/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingFactory.java
diff --git a/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingFactoryImpl.java
index b67ee97eb3..b67ee97eb3 100644
--- a/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingFactoryImpl.java
diff --git a/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingImpl.java
index b6bb6fe67c..b6bb6fe67c 100644
--- a/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingImpl.java
diff --git a/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/xml/JMSBindingConstants.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/xml/JMSBindingConstants.java
index e299e54cbe..e299e54cbe 100644
--- a/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/xml/JMSBindingConstants.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/xml/JMSBindingConstants.java
diff --git a/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/xml/JMSBindingProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/xml/JMSBindingProcessor.java
index 6b39a9d8d1..6b39a9d8d1 100644
--- a/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/xml/JMSBindingProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/xml/JMSBindingProcessor.java
diff --git a/branches/sca-equinox/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jms.JMSBindingFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jms.JMSBindingFactory
index f2d2c4bce1..f2d2c4bce1 100644
--- a/branches/sca-equinox/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jms.JMSBindingFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jms.JMSBindingFactory
diff --git a/branches/sca-equinox/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 97f1cc50be..97f1cc50be 100644
--- a/branches/sca-equinox/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
index 2f1048e601..2f1048e601 100644
--- a/branches/sca-equinox/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
diff --git a/branches/sca-equinox/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
index 6d59e41534..6d59e41534 100644
--- a/branches/sca-equinox/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/LICENSE
diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
index 66b107609d..66b107609d 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/NOTICE
diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/pom.xml
index 586211259b..586211259b 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/pom.xml
diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
index a9fff462fa..a9fff462fa 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
index eb85453bbb..eb85453bbb 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
index e2528f59e5..e2528f59e5 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
index 8d9f8193e9..8d9f8193e9 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
index c0d0415f91..c0d0415f91 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
index 64339fda7b..64339fda7b 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/ScaDomainScriptServlet.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/ScaDomainScriptServlet.java
index 999588abf1..999588abf1 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/ScaDomainScriptServlet.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/ScaDomainScriptServlet.java
diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 4767358e7a..4767358e7a 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js
index d837bab91c..d837bab91c 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js
diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
index 4b159fb563..4b159fb563 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
index ba87f22cf6..ba87f22cf6 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
index bf8c7d2c8a..bf8c7d2c8a 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
index 3e7b848221..3e7b848221 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
index 47ce8f4433..47ce8f4433 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
index 0619831c06..0619831c06 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
index ed73766202..ed73766202 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
index 978fdcfa7f..978fdcfa7f 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
diff --git a/branches/sca-equinox/modules/binding-jsonrpc/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc/LICENSE
diff --git a/branches/sca-equinox/modules/binding-jsonrpc/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc/META-INF/MANIFEST.MF
index 8ffba5b43e..8ffba5b43e 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-jsonrpc/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc/NOTICE
diff --git a/branches/sca-equinox/modules/binding-jsonrpc/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc/pom.xml
index da8f255803..da8f255803 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc/pom.xml
diff --git a/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
index ce86365980..ce86365980 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
diff --git a/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
index 707a9d7103..707a9d7103 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
diff --git a/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java
index 625457a668..625457a668 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java
diff --git a/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
index 1ee3631a98..1ee3631a98 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
diff --git a/branches/sca-equinox/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
index 8b9662997d..8b9662997d 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
diff --git a/branches/sca-equinox/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 0f39251068..0f39251068 100644
--- a/branches/sca-equinox/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/binding-rmi-runtime/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/binding-rmi-runtime/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/LICENSE
diff --git a/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
index 7c0706f387..7c0706f387 100644
--- a/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-rmi-runtime/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/binding-rmi-runtime/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/NOTICE
diff --git a/branches/sca-equinox/modules/binding-rmi-runtime/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/pom.xml
index 819d2621d4..819d2621d4 100644
--- a/branches/sca-equinox/modules/binding-rmi-runtime/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/pom.xml
diff --git a/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java
index 7754fb5485..7754fb5485 100644
--- a/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java
diff --git a/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java
index 11a03a4768..11a03a4768 100644
--- a/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java
diff --git a/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java
index 8a368a26c3..8a368a26c3 100644
--- a/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
index 4f657103d5..4f657103d5 100644
--- a/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index b188c24a20..b188c24a20 100644
--- a/branches/sca-equinox/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java
index cbc860ecc6..cbc860ecc6 100644
--- a/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java
diff --git a/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java
index 0a1f4283db..0a1f4283db 100644
--- a/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java
index 5b20d17c83..5b20d17c83 100644
--- a/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java
diff --git a/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java
index 461c176e1e..461c176e1e 100644
--- a/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java
diff --git a/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java
index 3b705d2c97..3b705d2c97 100644
--- a/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
index c62e3a6b8b..c62e3a6b8b 100644
--- a/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
diff --git a/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType
index 224a68f88d..224a68f88d 100644
--- a/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType
diff --git a/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType
index a83e7e6d1d..a83e7e6d1d 100644
--- a/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType
diff --git a/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite
index 2a0bcf0f76..2a0bcf0f76 100644
--- a/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite
diff --git a/branches/sca-equinox/modules/binding-rmi/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/binding-rmi/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi/LICENSE
diff --git a/branches/sca-equinox/modules/binding-rmi/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi/META-INF/MANIFEST.MF
index 10d09e6a03..10d09e6a03 100644
--- a/branches/sca-equinox/modules/binding-rmi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-rmi/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/binding-rmi/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi/NOTICE
diff --git a/branches/sca-equinox/modules/binding-rmi/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi/pom.xml
index ea9713e705..ea9713e705 100644
--- a/branches/sca-equinox/modules/binding-rmi/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi/pom.xml
diff --git a/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
index 02ecc6b65c..02ecc6b65c 100644
--- a/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
diff --git a/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java
index 38445fa838..38445fa838 100644
--- a/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java
diff --git a/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingFactoryImpl.java
index dfe96105e8..dfe96105e8 100644
--- a/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingFactoryImpl.java
diff --git a/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java
index 4acb9783f5..4acb9783f5 100644
--- a/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java
diff --git a/branches/sca-equinox/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rmi.RMIBindingFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rmi.RMIBindingFactory
index 889fcafae2..889fcafae2 100644
--- a/branches/sca-equinox/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rmi.RMIBindingFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rmi.RMIBindingFactory
diff --git a/branches/sca-equinox/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 56532d4f82..56532d4f82 100644
--- a/branches/sca-equinox/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/binding-rss-rome/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/LICENSE
diff --git a/branches/sca-equinox/modules/binding-rss-rome/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/META-INF/MANIFEST.MF
index b76536e0f5..b76536e0f5 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-rss-rome/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/NOTICE
diff --git a/branches/sca-equinox/modules/binding-rss-rome/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/pom.xml
index 26f93b2627..26f93b2627 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/pom.xml
diff --git a/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
index bb8dab391b..bb8dab391b 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
diff --git a/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
index 2213b50b53..2213b50b53 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
diff --git a/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
index 0912878938..0912878938 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
diff --git a/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
index e3a177198c..e3a177198c 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
diff --git a/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
index 7eb5aeb3df..7eb5aeb3df 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
diff --git a/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
index 216d8f3abe..216d8f3abe 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
diff --git a/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
index 8a30e9d3fb..8a30e9d3fb 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
index 4e5429ac83..4e5429ac83 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index e60dc2855a..e60dc2855a 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-equinox/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
index 489631ae3b..489631ae3b 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
diff --git a/branches/sca-equinox/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
index af87155f45..af87155f45 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
diff --git a/branches/sca-equinox/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
index e71156c379..e71156c379 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
diff --git a/branches/sca-equinox/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
index d45be65e20..d45be65e20 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
diff --git a/branches/sca-equinox/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
index 42d64ef957..42d64ef957 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
diff --git a/branches/sca-equinox/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
index 43cd5e00b9..43cd5e00b9 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
diff --git a/branches/sca-equinox/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
index 5ffcb50eb8..5ffcb50eb8 100644
--- a/branches/sca-equinox/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
diff --git a/branches/sca-equinox/modules/binding-rss/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-rss/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/binding-rss/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss/LICENSE
diff --git a/branches/sca-equinox/modules/binding-rss/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-rss/META-INF/MANIFEST.MF
index c2b76fa34c..c2b76fa34c 100644
--- a/branches/sca-equinox/modules/binding-rss/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-rss/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-rss/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/binding-rss/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss/NOTICE
diff --git a/branches/sca-equinox/modules/binding-rss/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-rss/pom.xml
index dd26e957a0..dd26e957a0 100644
--- a/branches/sca-equinox/modules/binding-rss/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss/pom.xml
diff --git a/branches/sca-equinox/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
index 2b4989264c..2b4989264c 100644
--- a/branches/sca-equinox/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
diff --git a/branches/sca-equinox/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
index 3e691e636e..3e691e636e 100644
--- a/branches/sca-equinox/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
diff --git a/branches/sca-equinox/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
index a4e6a8283d..a4e6a8283d 100644
--- a/branches/sca-equinox/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
diff --git a/branches/sca-equinox/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
index 6158752e7c..6158752e7c 100644
--- a/branches/sca-equinox/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
diff --git a/branches/sca-equinox/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
index 73c47a3f41..73c47a3f41 100644
--- a/branches/sca-equinox/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
diff --git a/branches/sca-equinox/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 2d0597ff01..2d0597ff01 100644
--- a/branches/sca-equinox/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/LICENSE
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/META-INF/MANIFEST.MF
index c4c462c6dd..c4c462c6dd 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/NOTICE
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/pom.xml
index 2a66978b6b..2a66978b6b 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/pom.xml
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
index e4bb708a01..e4bb708a01 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
index b105696b5d..b105696b5d 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
index 59e0aa6494..59e0aa6494 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
index f1aaa9188a..f1aaa9188a 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
index cf13d821f7..cf13d821f7 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 1b369cde06..1b369cde06 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
index 0ae3c68f99..0ae3c68f99 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java
index b345e563e3..b345e563e3 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java
index 472e85116e..472e85116e 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
index 5a68b6c3d9..5a68b6c3d9 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
index 3f48f1d465..3f48f1d465 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
index d6724d2a61..d6724d2a61 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
index 1a2788ac74..1a2788ac74 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
index e4d36ac78b..e4d36ac78b 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
index a83fcb3069..a83fcb3069 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
index c41548ec51..c41548ec51 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
index 7b8e00eb2a..7b8e00eb2a 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
index 62d61e4fff..62d61e4fff 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
index 2dcc8cc64b..2dcc8cc64b 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
index 8e7d2f8023..8e7d2f8023 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
index 7d07c4ff43..7d07c4ff43 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
index 7098f10622..7098f10622 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
index 07ae00bd31..07ae00bd31 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
index 36854cb7b8..36854cb7b8 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
index fd3e3a1158..fd3e3a1158 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
index 3400e97447..3400e97447 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
index 20dd97b74a..20dd97b74a 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
index 5f8ccf9466..5f8ccf9466 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
index b25aebd9df..b25aebd9df 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
index 5e4fd566c3..5e4fd566c3 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
index 093258051e..093258051e 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
index 8cf7230ed5..8cf7230ed5 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
index 066727f76d..066727f76d 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
index 485e0815d2..485e0815d2 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
index a5a4f04cb5..a5a4f04cb5 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
index bf30bdf42d..bf30bdf42d 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
index b519793290..b519793290 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
index 20a6c54e6e..20a6c54e6e 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
index a76008d0c5..a76008d0c5 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
index 0c22af22ab..0c22af22ab 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
diff --git a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/modules/binding-sca-corba/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-corba/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/binding-sca-corba/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-corba/LICENSE
diff --git a/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF
index f3d650a7fb..f3d650a7fb 100644
--- a/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-corba/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-sca-corba/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-corba/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/binding-sca-corba/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-corba/NOTICE
diff --git a/branches/sca-equinox/modules/binding-sca-corba/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-corba/pom.xml
index fda94934e5..fda94934e5 100644
--- a/branches/sca-equinox/modules/binding-sca-corba/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-corba/pom.xml
diff --git a/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java
index 2eee714de6..2eee714de6 100644
--- a/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java
diff --git a/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
index 257be80807..257be80807 100644
--- a/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
diff --git a/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java
index 9132c5d3c8..9132c5d3c8 100644
--- a/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java
diff --git a/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java
index c578f8bdf4..c578f8bdf4 100644
--- a/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java
index 8e15060266..8e15060266 100644
--- a/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java
index 128d5ef159..128d5ef159 100644
--- a/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java
diff --git a/branches/sca-equinox/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index e07a7cbb95..e07a7cbb95 100644
--- a/branches/sca-equinox/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-equinox/modules/binding-sca-xml/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/binding-sca-xml/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-xml/LICENSE
diff --git a/branches/sca-equinox/modules/binding-sca-xml/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-xml/META-INF/MANIFEST.MF
index 20a51c6a7a..20a51c6a7a 100644
--- a/branches/sca-equinox/modules/binding-sca-xml/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-xml/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-sca-xml/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/binding-sca-xml/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-xml/NOTICE
diff --git a/branches/sca-equinox/modules/binding-sca-xml/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-xml/pom.xml
index 133925ddd7..133925ddd7 100644
--- a/branches/sca-equinox/modules/binding-sca-xml/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-xml/pom.xml
diff --git a/branches/sca-equinox/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
index 56468c8204..56468c8204 100644
--- a/branches/sca-equinox/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
diff --git a/branches/sca-equinox/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 3b002cf6b6..3b002cf6b6 100644
--- a/branches/sca-equinox/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
index d89e26214b..d89e26214b 100644
--- a/branches/sca-equinox/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
diff --git a/branches/sca-equinox/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
index 110b789193..110b789193 100644
--- a/branches/sca-equinox/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
diff --git a/branches/sca-equinox/modules/binding-sca-xml/src/test/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-xml/src/test/resources/Calculator.composite
index 9028662d05..9028662d05 100644
--- a/branches/sca-equinox/modules/binding-sca-xml/src/test/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-xml/src/test/resources/Calculator.composite
diff --git a/branches/sca-equinox/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
index f02e7d6fc0..f02e7d6fc0 100644
--- a/branches/sca-equinox/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
diff --git a/branches/sca-equinox/modules/binding-sca/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/binding-sca/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/LICENSE
diff --git a/branches/sca-equinox/modules/binding-sca/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/META-INF/MANIFEST.MF
index 582b72660e..582b72660e 100644
--- a/branches/sca-equinox/modules/binding-sca/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-sca/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/binding-sca/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/NOTICE
diff --git a/branches/sca-equinox/modules/binding-sca/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/pom.xml
index 7dc5ce6a18..7dc5ce6a18 100644
--- a/branches/sca-equinox/modules/binding-sca/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/pom.xml
diff --git a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
index 167c93e86d..167c93e86d 100644
--- a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
diff --git a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
index 43b0cd8f4e..43b0cd8f4e 100644
--- a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
diff --git a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
index ea758823a9..ea758823a9 100644
--- a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
diff --git a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
index c93ddd9503..c93ddd9503 100644
--- a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
diff --git a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RemoteBindingHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RemoteBindingHelper.java
index 29c5374d51..29c5374d51 100644
--- a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RemoteBindingHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RemoteBindingHelper.java
diff --git a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProvider.java
index c4daa7c727..c4daa7c727 100644
--- a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java
index 9456f3d75b..9456f3d75b 100644
--- a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java
diff --git a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
index a6c70dcf1b..a6c70dcf1b 100644
--- a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
index 6a23c5011f..6a23c5011f 100644
--- a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingDefinitionsProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingDefinitionsProvider.java
index b72e5d9cfc..b72e5d9cfc 100644
--- a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingDefinitionsProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingDefinitionsProvider.java
diff --git a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java
index 613c75d9bf..613c75d9bf 100644
--- a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java
diff --git a/branches/sca-equinox/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
index 4efa03a933..4efa03a933 100644
--- a/branches/sca-equinox/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
diff --git a/branches/sca-equinox/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 6b2ddd8600..6b2ddd8600 100644
--- a/branches/sca-equinox/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-equinox/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
index a88144344f..a88144344f 100644
--- a/branches/sca-equinox/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
diff --git a/branches/sca-equinox/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
index 8bac9e01c9..8bac9e01c9 100644
--- a/branches/sca-equinox/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
diff --git a/branches/sca-equinox/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
index 268e6607fa..268e6607fa 100644
--- a/branches/sca-equinox/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
diff --git a/branches/sca-equinox/modules/binding-sca/src/test/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/test/resources/Calculator.composite
index 37b26f3d68..37b26f3d68 100644
--- a/branches/sca-equinox/modules/binding-sca/src/test/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-sca/src/test/resources/Calculator.composite
diff --git a/branches/sca-equinox/modules/binding-ws-axis2-policy/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2-policy/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/LICENSE
diff --git a/branches/sca-equinox/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF
index 0fe5e5af3e..0fe5e5af3e 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-ws-axis2-policy/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2-policy/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/NOTICE
diff --git a/branches/sca-equinox/modules/binding-ws-axis2-policy/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/pom.xml
index 3c679043cb..3c679043cb 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2-policy/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/pom.xml
diff --git a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationPolicy.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationPolicy.java
index 5aaea5a7a8..5aaea5a7a8 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationPolicy.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationPolicy.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationPolicyProcessor.java
index 1856830e49..1856830e49 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationPolicyProcessor.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationPolicyProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationPolicyProviderFactory.java
index 5ec4cf9baa..5ec4cf9baa 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationPolicyProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationPolicyProviderFactory.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationReferencePolicyInterceptor.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationReferencePolicyInterceptor.java
index c6344bbcbd..c6344bbcbd 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationReferencePolicyInterceptor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationReferencePolicyInterceptor.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationReferencePolicyProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationReferencePolicyProvider.java
index b6def7af1f..b6def7af1f 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationReferencePolicyProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationReferencePolicyProvider.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationServicePolicyInterceptor.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationServicePolicyInterceptor.java
index f6c8d072a4..f6c8d072a4 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationServicePolicyInterceptor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationServicePolicyInterceptor.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationServicePolicyProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationServicePolicyProvider.java
index 35504fddec..35504fddec 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationServicePolicyProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationServicePolicyProvider.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java
index fa26fedc9e..fa26fedc9e 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyHandler.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyHandler.java
index 5ac4e3f5fd..5ac4e3f5fd 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyHandler.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProcessor.java
index 33a1688138..33a1688138 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProcessor.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java
index 21261359cb..21261359cb 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 7a223848fa..7a223848fa 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index 7d7f4299f4..7d7f4299f4 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/PolicyReadTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/PolicyReadTestCase.java
index 44533fe0b6..44533fe0b6 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/PolicyReadTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/PolicyReadTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/mock_policies.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/mock_policies.xml
index 77f750cd0d..77f750cd0d 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2-policy/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/mock_policies.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2-policy/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/mock_policies.xml
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/LICENSE
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF
index 4ad0490a07..4ad0490a07 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/NOTICE
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/pom.xml
index 1dce2b588c..1dce2b588c 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/pom.xml
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
index b73725c2e2..b73725c2e2 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
index f49e1c35dd..f49e1c35dd 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
index 97eb3949af..97eb3949af 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
index 4b38b2b821..4b38b2b821 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
index 1729a9210a..1729a9210a 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
index 438e989d85..438e989d85 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
index a0cfab9154..a0cfab9154 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
index d467e0b3c8..d467e0b3c8 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
index 50164d4114..50164d4114 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
index 746b850ff0..746b850ff0 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
index 1f389b422f..1f389b422f 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
index 42441f3598..42441f3598 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
index 34899a4af0..34899a4af0 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
index ce3a0c33fb..ce3a0c33fb 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java
index 34f752e229..34f752e229 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationReferenceBindingConfigurator.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationReferenceBindingConfigurator.java
index 2bc6bff3c7..2bc6bff3c7 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationReferenceBindingConfigurator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationReferenceBindingConfigurator.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationServiceBindingConfigurator.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationServiceBindingConfigurator.java
index 6d311faec5..6d311faec5 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationServiceBindingConfigurator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/Axis2BasicAuthenticationServiceBindingConfigurator.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index a48ff54c77..a48ff54c77 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
index 370b83f87b..370b83f87b 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
index b11059df15..b11059df15 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
index 4d7a34d73d..4d7a34d73d 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list
index 1641457d28..1641457d28 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.3.mar b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.3.mar
index af3c45aa93..af3c45aa93 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.3.mar
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.3.mar
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.4.mar b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.4.mar
index ec870734a5..ec870734a5 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.4.mar
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.4.mar
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list
index e69de29bb2..e69de29bb2 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java
index 2ce23bf2c4..2ce23bf2c4 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java
index d4d20414e5..d4d20414e5 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java
index 767f59646f..767f59646f 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java
index e5e76af0b7..e5e76af0b7 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java
index 4e7c1b0539..4e7c1b0539 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/AccountService.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/AccountService.java
index 5edb4ddc5a..5edb4ddc5a 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/AccountService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/AccountService.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java
index 2dc7d8dee4..2dc7d8dee4 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/CustomerProfileData.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/CustomerProfileData.java
index 5c1ee6a435..5c1ee6a435 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/CustomerProfileData.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/CustomerProfileData.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java
index 6fccbcfd00..6fccbcfd00 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java
index 5e1a4cf259..5e1a4cf259 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java
index d028ced69e..d028ced69e 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java
index c7b503af17..c7b503af17 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java
index f474c12af3..f474c12af3 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java
index 88705c1a95..88705c1a95 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java
index f30286feea..f30286feea 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java
index 09b414b2d8..09b414b2d8 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java
index 274f6c8d28..274f6c8d28 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java
index bf371430a1..bf371430a1 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java
index d1cbfb88fd..d1cbfb88fd 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java
index 71d7bf68fb..71d7bf68fb 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java
index 4bb5bdb87d..4bb5bdb87d 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java
index 017d9bb478..017d9bb478 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java
index ab197ae25e..ab197ae25e 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java
index 8b4113e7ec..8b4113e7ec 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java
index 6c62d52cc6..6c62d52cc6 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java
index a9d31fb9a8..a9d31fb9a8 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
index 63026f95f7..63026f95f7 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java
index 7a6752126d..7a6752126d 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
index a41e0fd2c9..a41e0fd2c9 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java
index 661afdddad..661afdddad 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java
index 9b2e0eafa0..9b2e0eafa0 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java
index 98d9a73926..98d9a73926 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java
index 201d11a79f..201d11a79f 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java
index 23dcd5ff6d..23dcd5ff6d 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java
index dedd5a52a3..dedd5a52a3 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java
index 67d6f1c56e..67d6f1c56e 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java
index 45c5472100..45c5472100 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java
index 7a4b50cc2c..7a4b50cc2c 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java
index 18a713a243..18a713a243 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
index 1fd1b8d48e..1fd1b8d48e 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java
index 824132161c..824132161c 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java
index a432f46b7a..a432f46b7a 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java
index 88fc0d63fa..88fc0d63fa 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java
index 0d8914156f..0d8914156f 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java
index 5840f71057..5840f71057 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java
index 8a9921584a..8a9921584a 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java
index 66852c9ce3..66852c9ce3 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java
index cf342653c7..cf342653c7 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java
index 84b64d3902..84b64d3902 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java
index 04825b6b56..04825b6b56 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java
index 21b0aaed53..21b0aaed53 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
index f37a8deeb7..f37a8deeb7 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java
index 1bf02cb0d1..1bf02cb0d1 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java
index b8304a0c61..b8304a0c61 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
index 5a75846e9d..5a75846e9d 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index 32b042402b..32b042402b 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
index 5cea469e3d..5cea469e3d 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
index b11c50b00c..b11c50b00c 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd
index f09ed09b6a..f09ed09b6a 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdefs.xsd b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdefs.xsd
index ec67b84851..ec67b84851 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdefs.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdefs.xsd
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd
index 7c903c6394..7c903c6394 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
index 394bf05506..394bf05506 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
index c7081b9a72..c7081b9a72 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
index 7d3e1d1327..7d3e1d1327 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
index c2cd598508..c2cd598508 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl
index fe68755c47..fe68755c47 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
index 38a7c045be..38a7c045be 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl
index 7bf47bc412..7bf47bc412 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
index dee0effd99..dee0effd99 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl
index c66fa51c34..c66fa51c34 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl
index baa223f41c..baa223f41c 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
index 8fcbdef33d..8fcbdef33d 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl
index 73ca02246d..73ca02246d 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
index c506b09bb2..c506b09bb2 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.wsdl b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.wsdl
index 5908c43e7d..5908c43e7d 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.wsdl
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl
index 1a2272d7ee..1a2272d7ee 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite
index da5bab45e8..da5bab45e8 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite
index 13e002be1b..13e002be1b 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite
index 2f6fab0d07..2f6fab0d07 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
index 8fa2d3b8c0..8fa2d3b8c0 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties
index db221a4bea..db221a4bea 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
index 307edb9b37..307edb9b37 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml
index 65f8cb67d8..65f8cb67d8 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite
index 12b2b18e55..12b2b18e55 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
index 871e889835..871e889835 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties
index 8f9158a0f8..8f9158a0f8 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks
index 307edb9b37..307edb9b37 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite
index 2a22a0905d..2a22a0905d 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite
index e6f999aad7..e6f999aad7 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite
index d9e889768b..d9e889768b 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
index d7f40ccf0e..d7f40ccf0e 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
index 307edb9b37..307edb9b37 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl
index 41a491361f..41a491361f 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.wsdl b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.wsdl
index 99a8c6d81d..99a8c6d81d 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.wsdl
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl
index 80e4b62801..80e4b62801 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
index 008d42d03d..008d42d03d 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
index 7fff56377b..7fff56377b 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
index c042ae5675..c042ae5675 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
index fbd4c66c45..fbd4c66c45 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
index 033a77eea6..033a77eea6 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/binding-ws-wsdlgen/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/LICENSE
diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF
index 10b8a87794..10b8a87794 100644
--- a/branches/sca-equinox/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/binding-ws-wsdlgen/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/NOTICE
diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/pom.xml
index 7a047afdbf..7a047afdbf 100644
--- a/branches/sca-equinox/modules/binding-ws-wsdlgen/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/pom.xml
diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
index 79213a1ce7..79213a1ce7 100644
--- a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
index ee02632096..ee02632096 100644
--- a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java
index d0b79f9b0e..d0b79f9b0e 100644
--- a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java
diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java
index bf9e22f645..bf9e22f645 100644
--- a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java
diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
index b74358a0a1..b74358a0a1 100644
--- a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties
index 4bfbdd2901..4bfbdd2901 100644
--- a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties
diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java
index 7e6a1de546..7e6a1de546 100644
--- a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java
diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java
index 5056760366..5056760366 100644
--- a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java
diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java
index 14c319f44a..14c319f44a 100644
--- a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java
index 670c3a4003..670c3a4003 100644
--- a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestException.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestException.java
index 1e4f802e01..1e4f802e01 100644
--- a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestException.java
diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFault.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFault.java
index da2c285bac..da2c285bac 100644
--- a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFault.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFault.java
diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFaultBean.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFaultBean.java
index 64cce0e49d..64cce0e49d 100644
--- a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFaultBean.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFaultBean.java
diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java
index 3fd7361ae1..3fd7361ae1 100644
--- a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java
diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java
index 9635d65f99..9635d65f99 100644
--- a/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java
diff --git a/branches/sca-equinox/modules/binding-ws-xml/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/LICENSE
diff --git a/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF
index 3f6574e1e5..3f6574e1e5 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-ws-xml/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/NOTICE
diff --git a/branches/sca-equinox/modules/binding-ws-xml/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/pom.xml
index c819e16bd6..c819e16bd6 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/pom.xml
diff --git a/branches/sca-equinox/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/BindingBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/BindingBuilderImpl.java
index f2376231ab..f2376231ab 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/BindingBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/BindingBuilderImpl.java
diff --git a/branches/sca-equinox/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java
index ad2540e5fe..ad2540e5fe 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java
diff --git a/branches/sca-equinox/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
index 23322e822e..23322e822e 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
diff --git a/branches/sca-equinox/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
index 03c84a6b41..03c84a6b41 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
diff --git a/branches/sca-equinox/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index cb982e8647..cb982e8647 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/binding-ws-xml/src/main/resources/binding-wsxml-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/main/resources/binding-wsxml-validation-messages.properties
index 2dfa5e6133..2dfa5e6133 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/src/main/resources/binding-wsxml-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/main/resources/binding-wsxml-validation-messages.properties
diff --git a/branches/sca-equinox/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
index 550593f515..550593f515 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
index 2b3f314fb1..2b3f314fb1 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
diff --git a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
index d8d1b3401e..d8d1b3401e 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
diff --git a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
index f7460813cd..f7460813cd 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
diff --git a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
index 959802af43..959802af43 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
diff --git a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
index 37c80aa910..37c80aa910 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
diff --git a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
index 5e8e5dad0d..5e8e5dad0d 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
diff --git a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
index ad81fc7867..ad81fc7867 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
diff --git a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
diff --git a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
index 39cd5547d9..39cd5547d9 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
diff --git a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
index 8e26f7b4b5..8e26f7b4b5 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
diff --git a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
index c2210f4a94..c2210f4a94 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
diff --git a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
index 529b395fd5..529b395fd5 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
diff --git a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
index 666a7e4069..666a7e4069 100644
--- a/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
diff --git a/branches/sca-equinox/modules/binding-ws/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/binding-ws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/binding-ws/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws/LICENSE
diff --git a/branches/sca-equinox/modules/binding-ws/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/binding-ws/META-INF/MANIFEST.MF
index f7d2ff7b31..f7d2ff7b31 100644
--- a/branches/sca-equinox/modules/binding-ws/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/binding-ws/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/binding-ws/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/binding-ws/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws/NOTICE
diff --git a/branches/sca-equinox/modules/binding-ws/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/binding-ws/pom.xml
index 8fed399466..8fed399466 100644
--- a/branches/sca-equinox/modules/binding-ws/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws/pom.xml
diff --git a/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
index 2ccaa5dc58..2ccaa5dc58 100644
--- a/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
diff --git a/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
index 0d07a55a14..0d07a55a14 100644
--- a/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
diff --git a/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
index 1ad38c69e4..1ad38c69e4 100644
--- a/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
diff --git a/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
index a13584a3c2..a13584a3c2 100644
--- a/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
diff --git a/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
index 055e2012dc..055e2012dc 100644
--- a/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
diff --git a/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java b/sca-java-2.x/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
index d816c2c9c6..d816c2c9c6 100644
--- a/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
diff --git a/branches/sca-equinox/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory b/sca-java-2.x/branches/sca-equinox/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory
index 6d50a24b93..6d50a24b93 100644
--- a/branches/sca-equinox/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory
diff --git a/branches/sca-equinox/modules/contribution-java/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/contribution-java/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/LICENSE
diff --git a/branches/sca-equinox/modules/contribution-java/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/META-INF/MANIFEST.MF
index 7d338e5322..7d338e5322 100644
--- a/branches/sca-equinox/modules/contribution-java/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/contribution-java/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/contribution-java/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/NOTICE
diff --git a/branches/sca-equinox/modules/contribution-java/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/pom.xml
index afeca514a7..afeca514a7 100644
--- a/branches/sca-equinox/modules/contribution-java/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/pom.xml
diff --git a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
index 886c61c00a..886c61c00a 100644
--- a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
diff --git a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
index 41e93ec148..41e93ec148 100644
--- a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
diff --git a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
index d3568f6283..d3568f6283 100644
--- a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
diff --git a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
index af2ca9cd57..af2ca9cd57 100644
--- a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
diff --git a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
index fecb8406ca..fecb8406ca 100644
--- a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
diff --git a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
index d11753f3aa..d11753f3aa 100644
--- a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
diff --git a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
index aa68925376..aa68925376 100644
--- a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
diff --git a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
index f35f35ac4c..f35f35ac4c 100644
--- a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
diff --git a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java
index 8d5412f6d7..8d5412f6d7 100644
--- a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java
diff --git a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
index 71fd03d549..71fd03d549 100644
--- a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
diff --git a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
index e5dc397f4e..e5dc397f4e 100644
--- a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
diff --git a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
index cc18d5f798..cc18d5f798 100644
--- a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
diff --git a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
index 484eddd222..484eddd222 100644
--- a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
diff --git a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
index d191153e34..d191153e34 100644
--- a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
diff --git a/branches/sca-equinox/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
index a293330a57..a293330a57 100644
--- a/branches/sca-equinox/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
diff --git a/branches/sca-equinox/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ac1fa9aade..ac1fa9aade 100644
--- a/branches/sca-equinox/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index c69eb40636..c69eb40636 100644
--- a/branches/sca-equinox/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-equinox/modules/contribution-java/src/main/resources/contribution-java-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/resources/contribution-java-validation-messages.properties
index 70b58f75c0..70b58f75c0 100644
--- a/branches/sca-equinox/modules/contribution-java/src/main/resources/contribution-java-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/main/resources/contribution-java-validation-messages.properties
diff --git a/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
index 206d25e1e1..206d25e1e1 100644
--- a/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
diff --git a/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
index 779c00f71c..779c00f71c 100644
--- a/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
diff --git a/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
index 8de1d61a34..8de1d61a34 100644
--- a/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
index 76a3090c28..76a3090c28 100644
--- a/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-equinox/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar
diff --git a/branches/sca-equinox/modules/contribution-namespace/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/contribution-namespace/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/LICENSE
diff --git a/branches/sca-equinox/modules/contribution-namespace/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/META-INF/MANIFEST.MF
index d369b9de49..d369b9de49 100644
--- a/branches/sca-equinox/modules/contribution-namespace/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/contribution-namespace/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/contribution-namespace/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/NOTICE
diff --git a/branches/sca-equinox/modules/contribution-namespace/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/pom.xml
index de098cf031..de098cf031 100644
--- a/branches/sca-equinox/modules/contribution-namespace/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/pom.xml
diff --git a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
index a71fa61a54..a71fa61a54 100644
--- a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
diff --git a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
index c68aee8521..c68aee8521 100644
--- a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
diff --git a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
index 8af36d7da0..8af36d7da0 100644
--- a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
diff --git a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
index cfbac8bb1f..cfbac8bb1f 100644
--- a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
diff --git a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
index 8991585d32..8991585d32 100644
--- a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
diff --git a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportModelResolver.java
index 5c5ae22f77..5c5ae22f77 100644
--- a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportModelResolver.java
diff --git a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
index 6bf7c8f1d7..6bf7c8f1d7 100644
--- a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
diff --git a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
index 1146e593a9..1146e593a9 100644
--- a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
diff --git a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
index 6d2a31f702..6d2a31f702 100644
--- a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
diff --git a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
index e258dcf874..e258dcf874 100644
--- a/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
diff --git a/branches/sca-equinox/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
index 095866fb6f..095866fb6f 100644
--- a/branches/sca-equinox/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
diff --git a/branches/sca-equinox/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 86f199368b..86f199368b 100644
--- a/branches/sca-equinox/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/contribution-namespace/src/main/resources/contribution-namespace-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/resources/contribution-namespace-validation-messages.properties
index c7ddba3c3d..c7ddba3c3d 100644
--- a/branches/sca-equinox/modules/contribution-namespace/src/main/resources/contribution-namespace-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/main/resources/contribution-namespace-validation-messages.properties
diff --git a/branches/sca-equinox/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
index f4f6ed7879..f4f6ed7879 100644
--- a/branches/sca-equinox/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
index e3d96dc70f..e3d96dc70f 100644
--- a/branches/sca-equinox/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/contribution-osgi/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/contribution-osgi/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/LICENSE
diff --git a/branches/sca-equinox/modules/contribution-osgi/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/contribution-osgi/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/NOTICE
diff --git a/branches/sca-equinox/modules/contribution-osgi/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/pom.xml
index 342493e01b..342493e01b 100644
--- a/branches/sca-equinox/modules/contribution-osgi/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/pom.xml
diff --git a/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
index 0bbb8b707a..0bbb8b707a 100644
--- a/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
diff --git a/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
index 5033d7eefc..5033d7eefc 100644
--- a/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
diff --git a/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
index b3c2302f60..b3c2302f60 100644
--- a/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
diff --git a/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
index 07e80f66f3..07e80f66f3 100644
--- a/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
diff --git a/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
index 528a287328..528a287328 100644
--- a/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
diff --git a/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
index 15ad0bd948..15ad0bd948 100644
--- a/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
diff --git a/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
index e624b1d3b5..e624b1d3b5 100644
--- a/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
diff --git a/branches/sca-equinox/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
index 632d135cb5..632d135cb5 100644
--- a/branches/sca-equinox/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
diff --git a/branches/sca-equinox/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 02e8b411eb..02e8b411eb 100644
--- a/branches/sca-equinox/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-equinox/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
index 8dec190930..8dec190930 100644
--- a/branches/sca-equinox/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
diff --git a/branches/sca-equinox/modules/contribution-resource/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/META-INF/MANIFEST.MF
index 71371fa9fd..71371fa9fd 100644
--- a/branches/sca-equinox/modules/contribution-resource/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/contribution-resource/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/pom.xml
index 3f382c4de3..3f382c4de3 100644
--- a/branches/sca-equinox/modules/contribution-resource/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/pom.xml
diff --git a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
index 0bd30c19dd..0bd30c19dd 100644
--- a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
diff --git a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java
index 07eac9d843..07eac9d843 100644
--- a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java
diff --git a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java
index 4119c344ce..4119c344ce 100644
--- a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java
diff --git a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
index 5c6bb5e245..5c6bb5e245 100644
--- a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
diff --git a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java
index c2d525dfef..c2d525dfef 100644
--- a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java
diff --git a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java
index fd568e533d..fd568e533d 100644
--- a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java
diff --git a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
index f5f9fad167..f5f9fad167 100644
--- a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
diff --git a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java
index 880f5f5786..880f5f5786 100644
--- a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java
diff --git a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
index cd33f1290f..cd33f1290f 100644
--- a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
diff --git a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
index 7fdb74e256..7fdb74e256 100644
--- a/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
diff --git a/branches/sca-equinox/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 14eb81546d..14eb81546d 100644
--- a/branches/sca-equinox/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 08d2b1c338..08d2b1c338 100644
--- a/branches/sca-equinox/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-equinox/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory
index d39a5065c2..d39a5065c2 100644
--- a/branches/sca-equinox/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory
diff --git a/branches/sca-equinox/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties
index 58ee8153f8..58ee8153f8 100644
--- a/branches/sca-equinox/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties
diff --git a/branches/sca-equinox/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
index 52ec0b4cfc..52ec0b4cfc 100644
--- a/branches/sca-equinox/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
index 1fc439f073..1fc439f073 100644
--- a/branches/sca-equinox/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/contribution-xml/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/contribution-xml/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/LICENSE
diff --git a/branches/sca-equinox/modules/contribution-xml/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/META-INF/MANIFEST.MF
index 4f8d3ee0f8..4f8d3ee0f8 100644
--- a/branches/sca-equinox/modules/contribution-xml/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/contribution-xml/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/contribution-xml/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/NOTICE
diff --git a/branches/sca-equinox/modules/contribution-xml/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/pom.xml
index eaeacd65e3..eaeacd65e3 100644
--- a/branches/sca-equinox/modules/contribution-xml/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/pom.xml
diff --git a/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java
index 503a9c96d2..503a9c96d2 100644
--- a/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java
diff --git a/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
index 38da7740cd..38da7740cd 100644
--- a/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
diff --git a/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
index ff7bf7068a..ff7bf7068a 100644
--- a/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
diff --git a/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
index c293649135..c293649135 100644
--- a/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
diff --git a/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
index 02c5d48eb3..02c5d48eb3 100644
--- a/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
diff --git a/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
index ddc768b61c..ddc768b61c 100644
--- a/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
diff --git a/branches/sca-equinox/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index b69ea1e135..b69ea1e135 100644
--- a/branches/sca-equinox/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 23adab56b9..23adab56b9 100644
--- a/branches/sca-equinox/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-equinox/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 68030bf6e6..68030bf6e6 100644
--- a/branches/sca-equinox/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-equinox/modules/contribution-xml/src/main/resources/contribution-xml-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/src/main/resources/contribution-xml-validation-messages.properties
index 3e1a0187fe..3e1a0187fe 100644
--- a/branches/sca-equinox/modules/contribution-xml/src/main/resources/contribution-xml-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/src/main/resources/contribution-xml-validation-messages.properties
diff --git a/branches/sca-equinox/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
index ddb660a139..ddb660a139 100644
--- a/branches/sca-equinox/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/contribution/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/contribution/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/contribution/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/LICENSE
diff --git a/branches/sca-equinox/modules/contribution/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/contribution/META-INF/MANIFEST.MF
index d0a5651923..d0a5651923 100644
--- a/branches/sca-equinox/modules/contribution/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/contribution/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/contribution/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/contribution/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/NOTICE
diff --git a/branches/sca-equinox/modules/contribution/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/contribution/pom.xml
index e2cea9df57..e2cea9df57 100644
--- a/branches/sca-equinox/modules/contribution/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/pom.xml
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
index 7400501d85..7400501d85 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
index 4cf20125b9..4cf20125b9 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
index 81b0b08b9d..81b0b08b9d 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
index 80dece4496..80dece4496 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
index 67c9a05a0b..67c9a05a0b 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java
index 4043fb9eda..4043fb9eda 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
index 98954c288a..98954c288a 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java
index b2eddb8336..b2eddb8336 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java
index 20798dcd17..20798dcd17 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
index ffe190132c..ffe190132c 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
index bfa16b1ce3..bfa16b1ce3 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
index 35076f55a7..35076f55a7 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
index c0dd5431d7..c0dd5431d7 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
index 881987f622..881987f622 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
index c678c2eaef..c678c2eaef 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
index 0b41016caa..0b41016caa 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java
index 75b12b1260..75b12b1260 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java
index e67395337a..e67395337a 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java
index 17c09f2cbc..17c09f2cbc 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
index 5be0b188f4..5be0b188f4 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
index 029df61f0f..029df61f0f 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
index f23797a831..f23797a831 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionException.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionException.java
index 3b99eba586..3b99eba586 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionException.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionReadException.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionReadException.java
index 6fd7d0c91e..6fd7d0c91e 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionReadException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionReadException.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionResolveException.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionResolveException.java
index fe1a09d398..fe1a09d398 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionResolveException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionResolveException.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionRuntimeException.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionRuntimeException.java
index 0039dd9f8b..0039dd9f8b 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionRuntimeException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionRuntimeException.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionWriteException.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionWriteException.java
index 286c9dc791..286c9dc791 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionWriteException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionWriteException.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
index 3c67a8c550..3c67a8c550 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
index d268c5b011..d268c5b011 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
index bd38a609a6..bd38a609a6 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
index 402d4aa151..402d4aa151 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
index 9258a837d8..9258a837d8 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
index a6631f498e..a6631f498e 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
index 947fdb330d..947fdb330d 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
index 48e80a073a..48e80a073a 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
index cc31d2e073..cc31d2e073 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
index 1bf9b4d494..1bf9b4d494 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
index 9700e2bc60..9700e2bc60 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java
index b25bf0d669..b25bf0d669 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java
index ebad243c1c..ebad243c1c 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
index c44ca0c66a..c44ca0c66a 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
index 7714586951..7714586951 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnrecognizedElementException.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnrecognizedElementException.java
index 4c6f0b7282..4c6f0b7282 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnrecognizedElementException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnrecognizedElementException.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnsupportedContentTypeException.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnsupportedContentTypeException.java
index 8a166e42f0..8a166e42f0 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnsupportedContentTypeException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnsupportedContentTypeException.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnsupportedPackageTypeException.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnsupportedPackageTypeException.java
index ce94cef6a0..ce94cef6a0 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnsupportedPackageTypeException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnsupportedPackageTypeException.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
index c0eef5a7a8..c0eef5a7a8 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
index ee8fbba5a5..ee8fbba5a5 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
index cc3bb59a5b..cc3bb59a5b 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
index f3555ee71e..f3555ee71e 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java
index 13c622adf0..13c622adf0 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
index c6facd2b02..c6facd2b02 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java
index 9ae57c41d0..9ae57c41d0 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
index bf175813f3..bf175813f3 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
index 878a2efdab..878a2efdab 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
index b48742bcae..b48742bcae 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
index 2831bebbc4..2831bebbc4 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
index 4a25059792..4a25059792 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java
index 74f0f2d71d..74f0f2d71d 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
index 2394f4510b..2394f4510b 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
index 4e71e1ac30..4e71e1ac30 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
index 1ca9def4ea..1ca9def4ea 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
index cf3c77d5eb..cf3c77d5eb 100644
--- a/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
diff --git a/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
index bcc346d9f8..bcc346d9f8 100644
--- a/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
diff --git a/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
index 9e6433ba6c..9e6433ba6c 100644
--- a/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
diff --git a/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
index 8ea5fc0a7e..8ea5fc0a7e 100644
--- a/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
diff --git a/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint
index 607725bcfe..607725bcfe 100644
--- a/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint
diff --git a/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
index 9d78ca93d0..9d78ca93d0 100644
--- a/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
diff --git a/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory
index f2856cb259..f2856cb259 100644
--- a/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory
diff --git a/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
index ae6e876df6..ae6e876df6 100644
--- a/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
diff --git a/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
index 4bb65e55e7..4bb65e55e7 100644
--- a/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
diff --git a/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
index 727f8f6ce7..727f8f6ce7 100644
--- a/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
diff --git a/branches/sca-equinox/modules/contribution/src/main/resources/contribution-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/resources/contribution-validation-messages.properties
index 4f9f85048e..4f9f85048e 100644
--- a/branches/sca-equinox/modules/contribution/src/main/resources/contribution-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/main/resources/contribution-validation-messages.properties
diff --git a/branches/sca-equinox/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
index 14b6b956da..14b6b956da 100644
--- a/branches/sca-equinox/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
diff --git a/branches/sca-equinox/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
index f5b04f503c..f5b04f503c 100644
--- a/branches/sca-equinox/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
diff --git a/branches/sca-equinox/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
index e4082b3b85..e4082b3b85 100644
--- a/branches/sca-equinox/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
diff --git a/branches/sca-equinox/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
index cd586d3b2c..cd586d3b2c 100644
--- a/branches/sca-equinox/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
diff --git a/branches/sca-equinox/modules/contribution/src/test/resources/deployables/sample-calculator.jar b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-equinox/modules/contribution/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/test/resources/deployables/sample-calculator.jar
diff --git a/branches/sca-equinox/modules/contribution/src/test/resources/repository/sample-calculator.jar b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/test/resources/repository/sample-calculator.jar
index 9c46c679d2..9c46c679d2 100644
--- a/branches/sca-equinox/modules/contribution/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/test/resources/repository/sample-calculator.jar
diff --git a/branches/sca-equinox/modules/contribution/src/test/resources/test.composite b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/test/resources/test.composite
index 1e09549194..1e09549194 100644
--- a/branches/sca-equinox/modules/contribution/src/test/resources/test.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/test/resources/test.composite
diff --git a/branches/sca-equinox/modules/contribution/src/test/resources/test.ext b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/test/resources/test.ext
index e69de29bb2..e69de29bb2 100644
--- a/branches/sca-equinox/modules/contribution/src/test/resources/test.ext
+++ b/sca-java-2.x/branches/sca-equinox/modules/contribution/src/test/resources/test.ext
diff --git a/branches/sca-equinox/modules/core-databinding/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/core-databinding/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/LICENSE
diff --git a/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF
index e8d9bcbce0..e8d9bcbce0 100644
--- a/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/core-databinding/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/core-databinding/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/NOTICE
diff --git a/branches/sca-equinox/modules/core-databinding/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/pom.xml
index 5f7464c942..5f7464c942 100644
--- a/branches/sca-equinox/modules/core-databinding/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/pom.xml
diff --git a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
index c9ee4e485f..c9ee4e485f 100644
--- a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
diff --git a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
index e182b472d4..e182b472d4 100644
--- a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
diff --git a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
index 38ca2cd10c..38ca2cd10c 100644
--- a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
diff --git a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
index 124928db24..124928db24 100644
--- a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
diff --git a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java
index 012950e215..012950e215 100644
--- a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java
diff --git a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceTypeHelper.java b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceTypeHelper.java
index 97629ea7b5..97629ea7b5 100644
--- a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceTypeHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceTypeHelper.java
diff --git a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java
index ff6e444dcd..ff6e444dcd 100644
--- a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java
diff --git a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
index 6e2e714bdb..6e2e714bdb 100644
--- a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
diff --git a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
index fb5f939edb..fb5f939edb 100644
--- a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
diff --git a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
index 8d586905c4..8d586905c4 100644
--- a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
diff --git a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
index 841efa9398..841efa9398 100644
--- a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
diff --git a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
index b41c7fb012..b41c7fb012 100644
--- a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
diff --git a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
index 5814f3d215..5814f3d215 100644
--- a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
diff --git a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
index 3586f54d71..3586f54d71 100644
--- a/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
diff --git a/branches/sca-equinox/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index baba638c9b..baba638c9b 100644
--- a/branches/sca-equinox/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-equinox/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
index 00a8b0b79b..00a8b0b79b 100644
--- a/branches/sca-equinox/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/core-spi/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/core-spi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/core-spi/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/LICENSE
diff --git a/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF
index 12b9a19364..12b9a19364 100644
--- a/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/core-spi/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/core-spi/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/core-spi/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/NOTICE
diff --git a/branches/sca-equinox/modules/core-spi/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/core-spi/pom.xml
index 1ff4d62c53..1ff4d62c53 100644
--- a/branches/sca-equinox/modules/core-spi/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/pom.xml
diff --git a/branches/sca-equinox/modules/core-spi/src/doc/Context Model.emx b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/doc/Context Model.emx
index 0445ea5a6b..0445ea5a6b 100644
--- a/branches/sca-equinox/modules/core-spi/src/doc/Context Model.emx
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/doc/Context Model.emx
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
index ed4b57639c..ed4b57639c 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
index e92a8f2844..e92a8f2844 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
index 7a35036f03..7a35036f03 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
index 9766e164b8..9766e164b8 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
index 546757c766..546757c766 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java
index 81f619cef3..81f619cef3 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.java
index 79a10f6d84..79a10f6d84 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.java
index fdd304a9c7..fdd304a9c7 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.java
index be55981131..be55981131 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
index 957a15ce8a..957a15ce8a 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
index a5f221fc11..a5f221fc11 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
index 75719bb0cc..75719bb0cc 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
index 2748bbed9a..2748bbed9a 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
index a727693132..a727693132 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
index 38c900e36a..38c900e36a 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
index 2deb273f84..2deb273f84 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
index 3887db4873..3887db4873 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
index 0f6a932c51..0f6a932c51 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultDefinitionsProviderExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultDefinitionsProviderExtensionPoint.java
index 8b7902bec8..8b7902bec8 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultDefinitionsProviderExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultDefinitionsProviderExtensionPoint.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
index 0b7b779b46..0b7b779b46 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProvider.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProvider.java
index 7871aea07c..7871aea07c 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProvider.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderException.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderException.java
index 11464125ad..11464125ad 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderException.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderExtensionPoint.java
index 61cfbe8536..61cfbe8536 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderExtensionPoint.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
index 015c673d66..015c673d66 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
index 6a37d1e951..6a37d1e951 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
index f2b59a7c54..f2b59a7c54 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
index 644283dea1..644283dea1 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
index b60a14d2da..b60a14d2da 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
index 2102806881..2102806881 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
index d8f9973338..d8f9973338 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
index b3ab1d8b87..b3ab1d8b87 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
index e15234a549..e15234a549 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
index 851afee3c1..851afee3c1 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
index b6fafa5fb6..b6fafa5fb6 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
index 0e19538aff..0e19538aff 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
index 30bba78a40..30bba78a40 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
index 801bb9e294..801bb9e294 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
index 44ae7f552a..44ae7f552a 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
index 982724d798..982724d798 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
index da37385af1..da37385af1 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
index fbb7aae467..fbb7aae467 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
index 4b2c71b397..4b2c71b397 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
index d32af450ff..d32af450ff 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
index b1beac78e2..b1beac78e2 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
index 18ec2dfeaa..18ec2dfeaa 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
diff --git a/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
index ddd91bceac..ddd91bceac 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
diff --git a/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
index 91839e998f..91839e998f 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
diff --git a/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProviderExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProviderExtensionPoint
index b7501e854e..b7501e854e 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProviderExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProviderExtensionPoint
diff --git a/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
index e9de1f135f..e9de1f135f 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
diff --git a/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
index 95591dca5d..95591dca5d 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
diff --git a/branches/sca-equinox/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
index 3a27569a3b..3a27569a3b 100644
--- a/branches/sca-equinox/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
diff --git a/branches/sca-equinox/modules/core/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/core/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/LICENSE
diff --git a/branches/sca-equinox/modules/core/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/core/META-INF/MANIFEST.MF
index bb0f164a14..bb0f164a14 100644
--- a/branches/sca-equinox/modules/core/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/core/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/core/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/core/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/NOTICE
diff --git a/branches/sca-equinox/modules/core/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/core/pom.xml
index 1ffcf3048b..1ffcf3048b 100644
--- a/branches/sca-equinox/modules/core/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/pom.xml
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
index c86c876075..c86c876075 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
index 29dcc20f0b..29dcc20f0b 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
index 61f1f6494c..61f1f6494c 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
index 78096b20ab..78096b20ab 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
index c25c580fe6..c25c580fe6 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
index c3e5a12189..c3e5a12189 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
index 14a5f565fc..14a5f565fc 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
index b174dea6ce..b174dea6ce 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
index 32ac611e54..32ac611e54 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
index b386495a08..b386495a08 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
index af5230a163..af5230a163 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
index 58109fd86b..58109fd86b 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
index fc6d7abf6a..fc6d7abf6a 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
index 78b0887482..78b0887482 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
index 2bcf13f679..2bcf13f679 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
index c5b68389b2..c5b68389b2 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
index b577180291..b577180291 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
index aa69bb3ae5..aa69bb3ae5 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
index 1d178421cf..1d178421cf 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
index efa362a929..efa362a929 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
index 28e22b4f2c..28e22b4f2c 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
index 8a883f8e15..8a883f8e15 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
index 692d6861ba..692d6861ba 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
index 03c18c26b8..03c18c26b8 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
index 0bf66b2817..0bf66b2817 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
index d35b27fd24..d35b27fd24 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
index 3f64d2405b..3f64d2405b 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
index 588c43b8b1..588c43b8b1 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
index d19aa237cd..d19aa237cd 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
index 97c69c33cb..97c69c33cb 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
index b5b40811ad..b5b40811ad 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
index 2b37c30451..2b37c30451 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
index 15c4d50901..15c4d50901 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
index 6e93947dfb..6e93947dfb 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
index fcb48259b9..fcb48259b9 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
index 934f2f7aa0..934f2f7aa0 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
index c26501e7d7..c26501e7d7 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
index cade0499d3..cade0499d3 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
index a23b9af9ad..a23b9af9ad 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
index 0992638318..0992638318 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
index 6e182a6a14..6e182a6a14 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
index 7d7fc583c3..7d7fc583c3 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
index 733544d387..733544d387 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
index 60f90fb6b5..60f90fb6b5 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
index 94d67bffcc..94d67bffcc 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
index fc4bea3d9f..fc4bea3d9f 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
index 0b36b178f3..0b36b178f3 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
index cb836e42c1..cb836e42c1 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
index 875a252798..875a252798 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
index c007669bdf..c007669bdf 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
index 2c4d657882..2c4d657882 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
index 504bd9b036..504bd9b036 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
index 246f9c45d6..246f9c45d6 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
index ff92aa00a8..ff92aa00a8 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
index 7e7ab7a9e4..7e7ab7a9e4 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
index 786988613b..786988613b 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
index dc5d9ea8fe..dc5d9ea8fe 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
index 6263cf6313..6263cf6313 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java
index 4d4b324e05..4d4b324e05 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
index c359f04ae0..c359f04ae0 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
index 49f89661b1..49f89661b1 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
index c6fd9ec067..c6fd9ec067 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
index 1cfb6b06a4..1cfb6b06a4 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
index 0a20d793f7..0a20d793f7 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
index 0f82e5e864..0f82e5e864 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
index b19c14b3e0..b19c14b3e0 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
index 842ed4c547..842ed4c547 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
index 75261e11a8..75261e11a8 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
index 85a6626cdd..85a6626cdd 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
index c27b112f8a..c27b112f8a 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
index a2c0edb9b4..a2c0edb9b4 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
index 0471b2c52e..0471b2c52e 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
index 0f83dad97d..0f83dad97d 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
index 15959c0608..15959c0608 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
index bb46a2499b..bb46a2499b 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
index ea8d0e876c..ea8d0e876c 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
index adeb667277..adeb667277 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
index 90c13e6da8..90c13e6da8 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
index fb47a65edf..fb47a65edf 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
index 67d2b66f84..67d2b66f84 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
diff --git a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
index 170319b6e6..170319b6e6 100644
--- a/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
diff --git a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 5f54178483..5f54178483 100644
--- a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.assembly.CompositeActivator b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.assembly.CompositeActivator
index fc2760f73f..fc2760f73f 100644
--- a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.assembly.CompositeActivator
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.assembly.CompositeActivator
diff --git a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager
index 898054509b..898054509b 100644
--- a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager
diff --git a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
index af281d8f4d..af281d8f4d 100644
--- a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
diff --git a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry
index a4a0154987..a4a0154987 100644
--- a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry
diff --git a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
index bcbd5b0abf..bcbd5b0abf 100644
--- a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
diff --git a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
index 56e99be0f2..56e99be0f2 100644
--- a/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
index d3e31eb570..d3e31eb570 100644
--- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
index 99d5ec7bc9..99d5ec7bc9 100644
--- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
index 61164fa2de..61164fa2de 100644
--- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java.fixme b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java.fixme
index 1aba9656d8..1aba9656d8 100644
--- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java.fixme
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java.fixme
diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
index 1ad0927d16..1ad0927d16 100644
--- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java.fixme b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java.fixme
index b8150d4edc..b8150d4edc 100644
--- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java.fixme
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java.fixme
diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java
index 3184c3de92..3184c3de92 100644
--- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java
diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java
index 91b45dfbcb..91b45dfbcb 100644
--- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java
diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java
index a7617f7a70..a7617f7a70 100644
--- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java
diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java
index 75840efef4..75840efef4 100644
--- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java
diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java
index 225f23cb93..225f23cb93 100644
--- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java
diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java
index ba32a92c18..ba32a92c18 100644
--- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java
diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java
index 715f5f95c0..715f5f95c0 100644
--- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java
diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java
index 3b30d86f14..3b30d86f14 100644
--- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java
diff --git a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
index 341d889b7d..341d889b7d 100644
--- a/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
diff --git a/branches/sca-equinox/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
index 9ed0928a33..9ed0928a33 100644
--- a/branches/sca-equinox/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
+++ b/sca-java-2.x/branches/sca-equinox/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
diff --git a/branches/sca-equinox/modules/data-api/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/data-api/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/data-api/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/data-api/LICENSE
diff --git a/branches/sca-equinox/modules/data-api/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/data-api/META-INF/MANIFEST.MF
index 3776d4802a..3776d4802a 100644
--- a/branches/sca-equinox/modules/data-api/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/data-api/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/data-api/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/data-api/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/data-api/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/data-api/NOTICE
diff --git a/branches/sca-equinox/modules/data-api/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/data-api/pom.xml
index 40130243c7..40130243c7 100644
--- a/branches/sca-equinox/modules/data-api/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/data-api/pom.xml
diff --git a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java b/sca-java-2.x/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java
index f559d5d914..f559d5d914 100644
--- a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java
diff --git a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java b/sca-java-2.x/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java
index 5903fd95a4..5903fd95a4 100644
--- a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java
diff --git a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java b/sca-java-2.x/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java
index 37042c0895..37042c0895 100644
--- a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java
diff --git a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java b/sca-java-2.x/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java
index c30bbc771a..c30bbc771a 100644
--- a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java
diff --git a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java b/sca-java-2.x/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java
index 69512058b7..69512058b7 100644
--- a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java
diff --git a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java b/sca-java-2.x/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java
index 7f13db5228..7f13db5228 100644
--- a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java
diff --git a/branches/sca-equinox/modules/databinding-axiom/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/databinding-axiom/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/LICENSE
diff --git a/branches/sca-equinox/modules/databinding-axiom/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/META-INF/MANIFEST.MF
index 27299b7b8f..27299b7b8f 100644
--- a/branches/sca-equinox/modules/databinding-axiom/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/databinding-axiom/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/databinding-axiom/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/NOTICE
diff --git a/branches/sca-equinox/modules/databinding-axiom/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/pom.xml
index 90cfcda44d..90cfcda44d 100644
--- a/branches/sca-equinox/modules/databinding-axiom/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/pom.xml
diff --git a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
index e59038bfa1..e59038bfa1 100644
--- a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
diff --git a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
index cd820ab4b4..cd820ab4b4 100644
--- a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
diff --git a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
index 429a6dbe5d..429a6dbe5d 100644
--- a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
diff --git a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
index e23d89327c..e23d89327c 100644
--- a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
diff --git a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
index 3dc73c89cb..3dc73c89cb 100644
--- a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
diff --git a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
index ef7359fbcd..ef7359fbcd 100644
--- a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
diff --git a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
index ea40e61746..ea40e61746 100644
--- a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
diff --git a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
index b2c004324c..b2c004324c 100644
--- a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
diff --git a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
index 01e7003b20..01e7003b20 100644
--- a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
diff --git a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
index 9084f09dc0..9084f09dc0 100644
--- a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
diff --git a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
index 88d6b462c1..88d6b462c1 100644
--- a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
diff --git a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
index 9eccd52d74..9eccd52d74 100644
--- a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
diff --git a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
index 761185c297..761185c297 100644
--- a/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
diff --git a/branches/sca-equinox/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 2e94116177..2e94116177 100644
--- a/branches/sca-equinox/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-equinox/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index a1f18f9638..a1f18f9638 100644
--- a/branches/sca-equinox/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-equinox/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
index 7453cb787a..7453cb787a 100644
--- a/branches/sca-equinox/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-axiom/src/test/resources/ipo.xml b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/test/resources/ipo.xml
index df901d183d..df901d183d 100644
--- a/branches/sca-equinox/modules/databinding-axiom/src/test/resources/ipo.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/test/resources/ipo.xml
diff --git a/branches/sca-equinox/modules/databinding-axiom/src/test/resources/ipo.xsd b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/test/resources/ipo.xsd
index af1e73172d..af1e73172d 100755
--- a/branches/sca-equinox/modules/databinding-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/test/resources/ipo.xsd
diff --git a/branches/sca-equinox/modules/databinding-axiom/src/test/resources/order.wsdl b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/test/resources/order.wsdl
index a5ead60382..a5ead60382 100644
--- a/branches/sca-equinox/modules/databinding-axiom/src/test/resources/order.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-axiom/src/test/resources/order.wsdl
diff --git a/branches/sca-equinox/modules/databinding-fastinfoset/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/LICENSE
index d645695673..d645695673 100644
--- a/branches/sca-equinox/modules/databinding-fastinfoset/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/LICENSE
diff --git a/branches/sca-equinox/modules/databinding-fastinfoset/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/META-INF/MANIFEST.MF
index bf9b73f728..bf9b73f728 100644
--- a/branches/sca-equinox/modules/databinding-fastinfoset/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/databinding-fastinfoset/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/NOTICE
index d83ebbe236..d83ebbe236 100644
--- a/branches/sca-equinox/modules/databinding-fastinfoset/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/NOTICE
diff --git a/branches/sca-equinox/modules/databinding-fastinfoset/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/pom.xml
index 40015147fe..40015147fe 100644
--- a/branches/sca-equinox/modules/databinding-fastinfoset/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/pom.xml
diff --git a/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
index 2e0aa629f3..2e0aa629f3 100644
--- a/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
diff --git a/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
index 77f6b77636..77f6b77636 100644
--- a/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
diff --git a/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
index 73d549f4f8..73d549f4f8 100644
--- a/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
diff --git a/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
index 1c12a5dcad..1c12a5dcad 100644
--- a/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
diff --git a/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
index b0d56b3bb6..b0d56b3bb6 100644
--- a/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
diff --git a/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
index d18206600c..d18206600c 100644
--- a/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
diff --git a/branches/sca-equinox/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index ea47ee7191..ea47ee7191 100644
--- a/branches/sca-equinox/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-equinox/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
index 1610b4f54d..1610b4f54d 100644
--- a/branches/sca-equinox/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
diff --git a/branches/sca-equinox/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
index bb8adf39be..bb8adf39be 100644
--- a/branches/sca-equinox/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-fastinfoset/src/test/resources/ipo.xsd b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100644
--- a/branches/sca-equinox/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/databinding-jaxb-axiom/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/LICENSE
diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF
index 30269ccdca..30269ccdca 100644
--- a/branches/sca-equinox/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/databinding-jaxb-axiom/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/NOTICE
diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/pom.xml
index cab798a7cb..cab798a7cb 100644
--- a/branches/sca-equinox/modules/databinding-jaxb-axiom/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/pom.xml
diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java
index 93277e77bf..93277e77bf 100644
--- a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java
index c4726ad8fa..c4726ad8fa 100644
--- a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
index b6fa362ed9..b6fa362ed9 100644
--- a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
index 3753fd9d64..3753fd9d64 100644
--- a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java
index f30a6c1cb8..f30a6c1cb8 100644
--- a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java
index 28997cd244..28997cd244 100644
--- a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java
index 5a5afc13cb..5a5afc13cb 100644
--- a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java
index 0a12654524..0a12654524 100644
--- a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStreamWriterWithOS.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStreamWriterWithOS.java
index 44e34c3647..44e34c3647 100644
--- a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStreamWriterWithOS.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStreamWriterWithOS.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java
index e8e3193e24..e8e3193e24 100644
--- a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index b48e629927..b48e629927 100644
--- a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java
index 543a76594f..543a76594f 100644
--- a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java
index 3c00307941..3c00307941 100644
--- a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd
diff --git a/branches/sca-equinox/modules/databinding-jaxb/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/LICENSE
diff --git a/branches/sca-equinox/modules/databinding-jaxb/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/META-INF/MANIFEST.MF
index f07a915800..f07a915800 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/databinding-jaxb/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/NOTICE
diff --git a/branches/sca-equinox/modules/databinding-jaxb/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/pom.xml
index 6c98bc5f8b..6c98bc5f8b 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/pom.xml
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java
index 003b4fb992..003b4fb992 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
index 062da48206..062da48206 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
index 3e262c7d12..3e262c7d12 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
index eee5c77285..eee5c77285 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
index 29951a5e16..29951a5e16 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
index c64ce81fdf..c64ce81fdf 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
index 7297399f5e..7297399f5e 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
index eebb4b2e37..eebb4b2e37 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java
index 8805d72627..8805d72627 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
index a60a882801..a60a882801 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java
index f83c7f09d9..f83c7f09d9 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
index a1f4c12c8f..a1f4c12c8f 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java
index 5f90aa4d7a..5f90aa4d7a 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
index e375a9b85e..e375a9b85e 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
index 840edfd234..840edfd234 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
index 5559690de8..5559690de8 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java
index 5fa98b5ed1..5fa98b5ed1 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java
index ad4bd04084..ad4bd04084 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
index af3fa3fb66..af3fa3fb66 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 58d6123373..58d6123373 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 4e062e4c22..4e062e4c22 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint
index d1f6d9f1e3..d1f6d9f1e3 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java
index 5c5c892f33..5c5c892f33 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java
index 761414e92b..761414e92b 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
index 5452175c54..5452175c54 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
index 74f124f892..74f124f892 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
index 8780b788af..8780b788af 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java
index c10a5227ce..c10a5227ce 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java
index 9bdfb108fe..9bdfb108fe 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java
index b8e9ee7f7d..b8e9ee7f7d 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java
index 5c511e6ccb..5c511e6ccb 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java
index 62dfa6f73c..62dfa6f73c 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
index 2603412a9d..2603412a9d 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-jaxb/src/test/resources/ipo.xsd b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100755
--- a/branches/sca-equinox/modules/databinding-jaxb/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-jaxb/src/test/resources/ipo.xsd
diff --git a/branches/sca-equinox/modules/databinding-json/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/LICENSE
index d645695673..d645695673 100644
--- a/branches/sca-equinox/modules/databinding-json/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/LICENSE
diff --git a/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF
index c60394a1ae..c60394a1ae 100644
--- a/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/databinding-json/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/databinding-json/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/NOTICE
diff --git a/branches/sca-equinox/modules/databinding-json/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/pom.xml
index e21d8e5dbf..e21d8e5dbf 100644
--- a/branches/sca-equinox/modules/databinding-json/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/pom.xml
diff --git a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
index b1813c9eab..b1813c9eab 100644
--- a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
diff --git a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
index 4e08384f09..4e08384f09 100644
--- a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
diff --git a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
index b70f772696..b70f772696 100644
--- a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
diff --git a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
index 4bda838b18..4bda838b18 100644
--- a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
diff --git a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
index fb29710506..fb29710506 100644
--- a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
diff --git a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
index a928deef22..a928deef22 100644
--- a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
diff --git a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
index de023157bc..de023157bc 100644
--- a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
diff --git a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
index ff5968bccd..ff5968bccd 100644
--- a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
diff --git a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
index aa75afc9d4..aa75afc9d4 100644
--- a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
diff --git a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
index 1072b70029..1072b70029 100644
--- a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
diff --git a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
index adc38772be..adc38772be 100644
--- a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
diff --git a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
index 5b0312056e..5b0312056e 100644
--- a/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
diff --git a/branches/sca-equinox/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index b0baaeb398..b0baaeb398 100644
--- a/branches/sca-equinox/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-equinox/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index b122533f6e..b122533f6e 100644
--- a/branches/sca-equinox/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
index 3c7f151ed7..3c7f151ed7 100644
--- a/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
index 3b36f5be74..3b36f5be74 100644
--- a/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
index 60b293c1d4..60b293c1d4 100644
--- a/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
diff --git a/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
index d32e0763c7..d32e0763c7 100644
--- a/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
diff --git a/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
index 3a2b95a4e2..3a2b95a4e2 100644
--- a/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
diff --git a/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
index 84995baadf..84995baadf 100644
--- a/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-json/src/test/resources/ipo.xsd b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100644
--- a/branches/sca-equinox/modules/databinding-json/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-json/src/test/resources/ipo.xsd
diff --git a/branches/sca-equinox/modules/databinding-saxon/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/LICENSE
index d645695673..d645695673 100644
--- a/branches/sca-equinox/modules/databinding-saxon/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/LICENSE
diff --git a/branches/sca-equinox/modules/databinding-saxon/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/META-INF/MANIFEST.MF
index a1d59a50c3..a1d59a50c3 100644
--- a/branches/sca-equinox/modules/databinding-saxon/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/databinding-saxon/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/databinding-saxon/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/NOTICE
diff --git a/branches/sca-equinox/modules/databinding-saxon/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/pom.xml
index 2ac6cd9fbc..2ac6cd9fbc 100644
--- a/branches/sca-equinox/modules/databinding-saxon/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/pom.xml
diff --git a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
index 25f8ee886f..25f8ee886f 100644
--- a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
diff --git a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java
index 7122217b8b..7122217b8b 100644
--- a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java
diff --git a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
index fabadd34ea..fabadd34ea 100644
--- a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
diff --git a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
index a5093f8cdf..a5093f8cdf 100644
--- a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
diff --git a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.java
index 36ebac3aea..36ebac3aea 100644
--- a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.java
diff --git a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
index 1e5b816662..1e5b816662 100644
--- a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
diff --git a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
index 616bcca6c5..616bcca6c5 100644
--- a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
diff --git a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
index ecb20b24b5..ecb20b24b5 100644
--- a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
diff --git a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
index ccf842710d..ccf842710d 100644
--- a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
diff --git a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
index 2f51cf86ec..2f51cf86ec 100644
--- a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
diff --git a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
index 67d89a6e0b..67d89a6e0b 100644
--- a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
diff --git a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java
index 16d5f524bb..16d5f524bb 100644
--- a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java
diff --git a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
index 7589f6789b..7589f6789b 100644
--- a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
diff --git a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
index 5da4effcfd..5da4effcfd 100644
--- a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
diff --git a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java
index 065121520b..065121520b 100644
--- a/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java
diff --git a/branches/sca-equinox/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index d895237c7d..d895237c7d 100644
--- a/branches/sca-equinox/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-equinox/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 4d927ce53d..4d927ce53d 100644
--- a/branches/sca-equinox/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-equinox/modules/databinding-sdo-axiom/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/databinding-sdo-axiom/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/LICENSE
diff --git a/branches/sca-equinox/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF
index 01d84174ee..01d84174ee 100644
--- a/branches/sca-equinox/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/databinding-sdo-axiom/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/databinding-sdo-axiom/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/NOTICE
diff --git a/branches/sca-equinox/modules/databinding-sdo-axiom/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/pom.xml
index 4b8b35a4e3..4b8b35a4e3 100644
--- a/branches/sca-equinox/modules/databinding-sdo-axiom/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/pom.xml
diff --git a/branches/sca-equinox/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
index 02f43000b4..02f43000b4 100644
--- a/branches/sca-equinox/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
diff --git a/branches/sca-equinox/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
index aa7f99724d..aa7f99724d 100644
--- a/branches/sca-equinox/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
diff --git a/branches/sca-equinox/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
index dc3c2610a4..dc3c2610a4 100644
--- a/branches/sca-equinox/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
diff --git a/branches/sca-equinox/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
index a55a9f37cb..a55a9f37cb 100644
--- a/branches/sca-equinox/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
diff --git a/branches/sca-equinox/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index c870ec2406..c870ec2406 100644
--- a/branches/sca-equinox/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-equinox/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
index 57dd056526..57dd056526 100644
--- a/branches/sca-equinox/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
index f69ef598b8..f69ef598b8 100644
--- a/branches/sca-equinox/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
diff --git a/branches/sca-equinox/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
index 5015a1b697..5015a1b697 100644
--- a/branches/sca-equinox/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/branches/sca-equinox/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
diff --git a/branches/sca-equinox/modules/databinding-sdo-axiom/src/test/resources/stock.xsd b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
index a0a6717371..a0a6717371 100644
--- a/branches/sca-equinox/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
diff --git a/branches/sca-equinox/modules/databinding-sdo/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/databinding-sdo/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/LICENSE
diff --git a/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF
index decc3332d2..decc3332d2 100644
--- a/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/databinding-sdo/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/databinding-sdo/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/NOTICE
diff --git a/branches/sca-equinox/modules/databinding-sdo/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/pom.xml
index a0ae3f45a2..a0ae3f45a2 100644
--- a/branches/sca-equinox/modules/databinding-sdo/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/pom.xml
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
index 503e54e530..503e54e530 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
index 8ce8eae587..8ce8eae587 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
index 116ac4c553..116ac4c553 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
index 7afb7d9463..7afb7d9463 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
index 1e2f3a795c..1e2f3a795c 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
index 4a05492dd8..4a05492dd8 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
index 695722be18..695722be18 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
index 5a5e35cbbd..5a5e35cbbd 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
index c83ec53b01..c83ec53b01 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
index c1978883df..c1978883df 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
index 8a1cd666d8..8a1cd666d8 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
index 7ac423f8d8..7ac423f8d8 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
index 4e5aa1d5fd..4e5aa1d5fd 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
index e70fa08477..e70fa08477 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
index baf3e2e90a..baf3e2e90a 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
index ac452910f6..ac452910f6 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ffe8b895b8..ffe8b895b8 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index afd00b552c..afd00b552c 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index b1916fd32a..b1916fd32a 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
index f53f08f377..f53f08f377 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
index 5a0208b290..5a0208b290 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
index 4bc41a5541..4bc41a5541 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
index 44d11cd586..44d11cd586 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
index 6a82a7fb18..6a82a7fb18 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
index 26c0f3ecb6..26c0f3ecb6 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
index e0d1c9bf12..e0d1c9bf12 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
index 3c21b56c9f..3c21b56c9f 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
index 2aaae3c6d8..2aaae3c6d8 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
index 11d8495de8..11d8495de8 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
index ce04f5be3f..ce04f5be3f 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
index 114c568c38..114c568c38 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/test/resources/ipo.xsd b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100755
--- a/branches/sca-equinox/modules/databinding-sdo/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/resources/ipo.xsd
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/test/resources/model/sca-core.xsd b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
index 56c6977254..56c6977254 100755
--- a/branches/sca-equinox/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
index bbaf58f00c..bbaf58f00c 100755
--- a/branches/sca-equinox/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/test/resources/stock.xsd b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/resources/stock.xsd
index a0a6717371..a0a6717371 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/test/resources/stock.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/resources/stock.xsd
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/test/resources/wrapper.xml b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/resources/wrapper.xml
index 2526629409..2526629409 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/test/resources/wrapper.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/resources/wrapper.xml
diff --git a/branches/sca-equinox/modules/databinding-sdo/src/test/resources/wrapper.xsd b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/resources/wrapper.xsd
index ea4dc5f7f3..ea4dc5f7f3 100644
--- a/branches/sca-equinox/modules/databinding-sdo/src/test/resources/wrapper.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-sdo/src/test/resources/wrapper.xsd
diff --git a/branches/sca-equinox/modules/databinding-xmlbeans/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/LICENSE
index d645695673..d645695673 100755
--- a/branches/sca-equinox/modules/databinding-xmlbeans/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/LICENSE
diff --git a/branches/sca-equinox/modules/databinding-xmlbeans/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/META-INF/MANIFEST.MF
index a873498182..a873498182 100644
--- a/branches/sca-equinox/modules/databinding-xmlbeans/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/databinding-xmlbeans/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/databinding-xmlbeans/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/NOTICE
diff --git a/branches/sca-equinox/modules/databinding-xmlbeans/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/pom.xml
index 44758bf472..44758bf472 100644
--- a/branches/sca-equinox/modules/databinding-xmlbeans/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/pom.xml
diff --git a/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
index e7b240b781..e7b240b781 100644
--- a/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
diff --git a/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
index 15616979c2..15616979c2 100644
--- a/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
diff --git a/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java
index 506c42e40f..506c42e40f 100644
--- a/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java
diff --git a/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
index ca84f961b1..ca84f961b1 100644
--- a/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
diff --git a/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
index c820d9d250..c820d9d250 100644
--- a/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
diff --git a/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
index bbffb7d748..bbffb7d748 100644
--- a/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
diff --git a/branches/sca-equinox/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 907d06559a..907d06559a 100644
--- a/branches/sca-equinox/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-equinox/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 4e419de051..4e419de051 100644
--- a/branches/sca-equinox/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-equinox/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
index 7b98ddb021..7b98ddb021 100644
--- a/branches/sca-equinox/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
diff --git a/branches/sca-equinox/modules/databinding-xmlbeans/src/test/resources/ipo.xsd b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100755
--- a/branches/sca-equinox/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
diff --git a/branches/sca-equinox/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
index a397182672..a397182672 100755
--- a/branches/sca-equinox/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
diff --git a/branches/sca-equinox/modules/databinding/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/databinding/LICENSE
index 616bec99ed..616bec99ed 100644
--- a/branches/sca-equinox/modules/databinding/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/LICENSE
diff --git a/branches/sca-equinox/modules/databinding/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/databinding/META-INF/MANIFEST.MF
index 14592efd70..14592efd70 100644
--- a/branches/sca-equinox/modules/databinding/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/databinding/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/databinding/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/databinding/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/NOTICE
diff --git a/branches/sca-equinox/modules/databinding/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/databinding/pom.xml
index 676b333beb..676b333beb 100644
--- a/branches/sca-equinox/modules/databinding/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/pom.xml
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
index 547f9d9f4f..547f9d9f4f 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
index 2ff5d866b4..2ff5d866b4 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
index 505a810276..505a810276 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
index 1aac6d48be..1aac6d48be 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
index 51cbba02d2..51cbba02d2 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
index 3bd729b472..3bd729b472 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
index 6b8acfc7b4..6b8acfc7b4 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
index 81264923eb..81264923eb 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
index 600a6477f6..600a6477f6 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
index 4e6d130aa9..4e6d130aa9 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
index 9ffadd1eae..9ffadd1eae 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
index 4f949f7dff..4f949f7dff 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
index 2aa0ad7c15..2aa0ad7c15 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
index ee7efe4860..ee7efe4860 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
index a91410ed71..a91410ed71 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
index e940f8675f..e940f8675f 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
index 4405077e29..4405077e29 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
index 650e909c61..650e909c61 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
index 640a43f55d..640a43f55d 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
index 4bbcf7ddef..4bbcf7ddef 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
index 94a2cdb0bb..94a2cdb0bb 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
index 64b3d22c10..64b3d22c10 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
index 01916dfb96..01916dfb96 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
index cc7b40d06b..cc7b40d06b 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
index 4a918488c5..4a918488c5 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
index 45896ca6a1..45896ca6a1 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
index b7ddf87a41..b7ddf87a41 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
index a1a89005b3..a1a89005b3 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
index c91176fc2c..c91176fc2c 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
index 32a2313f59..32a2313f59 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
index a6c0639411..a6c0639411 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
index fb747864e7..fb747864e7 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
index 2f95c2a9c6..2f95c2a9c6 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
index 9615f43572..9615f43572 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
index 58f594751a..58f594751a 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
index 4942fef0da..4942fef0da 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
index b96b394bb8..b96b394bb8 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
index fb04014051..fb04014051 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
index 7ae64c6a27..7ae64c6a27 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
index 11c82e062c..11c82e062c 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
index 06feeffabd..06feeffabd 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
index a723fd445c..a723fd445c 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
index 1e39150f4a..1e39150f4a 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java
index 34a82fd2d3..34a82fd2d3 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
index 3423d3e3b0..3423d3e3b0 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
index 92058d769f..92058d769f 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
index 9e1ebb3522..9e1ebb3522 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
index 8c7a742cdd..8c7a742cdd 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java
index 507c141c33..507c141c33 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
index 7f49a50e1e..7f49a50e1e 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
index 5f583da283..5f583da283 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
index 39116ba4a1..39116ba4a1 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
index e40c3006fb..e40c3006fb 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
index 3b7bd3088a..3b7bd3088a 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
index 5a31d9db91..5a31d9db91 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
index fdc3c4139b..fdc3c4139b 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
index 04d7d65a0d..04d7d65a0d 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
index abc4bf3785..abc4bf3785 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
index 5500d0bcca..5500d0bcca 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
index d5bf7e76b5..d5bf7e76b5 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
index 3c9022bc3c..3c9022bc3c 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
index 1b54b1fd1e..1b54b1fd1e 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
index c9631595dc..c9631595dc 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
index 1e8d14a151..1e8d14a151 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
index 70387fa862..70387fa862 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
index 188ecaffa3..188ecaffa3 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
index 38c61d64c8..38c61d64c8 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
index cb9d538389..cb9d538389 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
index d2625fba11..d2625fba11 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
index e041f85214..e041f85214 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
index ee9aa1bb76..ee9aa1bb76 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
index 8a2b6b39aa..8a2b6b39aa 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
index 2ed548ad76..2ed548ad76 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
index 6257681091..6257681091 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
index 52a1d02631..52a1d02631 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
index 103ecbd7d1..103ecbd7d1 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
index f8967e35b6..f8967e35b6 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
index 062e10cc45..062e10cc45 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
index c56dba1843..c56dba1843 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
index c2de202a9b..c2de202a9b 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
index a7364006d0..a7364006d0 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
index d73e495798..d73e495798 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
index 5ab7272d58..5ab7272d58 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
index cd33e64176..cd33e64176 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
index a42d6acc9a..a42d6acc9a 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
index f1084cf2a3..f1084cf2a3 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
index f7c895db1e..f7c895db1e 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
index e2d0416aec..e2d0416aec 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
index 9b39f039b1..9b39f039b1 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
index 6db731bc9f..6db731bc9f 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
index 920ebb511c..920ebb511c 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
index f32f93d098..f32f93d098 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
index 36cf5e9c9b..36cf5e9c9b 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java
index 86ebd627f7..86ebd627f7 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
index 3dd125463e..3dd125463e 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java
index f4bc357c7d..f4bc357c7d 100644
--- a/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java
diff --git a/branches/sca-equinox/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 10e6082b34..10e6082b34 100644
--- a/branches/sca-equinox/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-equinox/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
index 568e04f9de..568e04f9de 100644
--- a/branches/sca-equinox/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
diff --git a/branches/sca-equinox/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 96115be404..96115be404 100644
--- a/branches/sca-equinox/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-equinox/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
index e02cd5c934..e02cd5c934 100644
--- a/branches/sca-equinox/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
diff --git a/branches/sca-equinox/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
index 7d8642fb1e..7d8642fb1e 100644
--- a/branches/sca-equinox/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
diff --git a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
index 8c710062ad..8c710062ad 100644
--- a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
diff --git a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
index b31f17d5ed..b31f17d5ed 100644
--- a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
diff --git a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java.fixme b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java.fixme
index 562c22354c..562c22354c 100644
--- a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java.fixme
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java.fixme
diff --git a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java.fixme b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java.fixme
index 243ac71201..243ac71201 100644
--- a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java.fixme
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java.fixme
diff --git a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
index 07ee0b0ca4..07ee0b0ca4 100644
--- a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
diff --git a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java.fixme b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java.fixme
index db210683dd..db210683dd 100644
--- a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java.fixme
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java.fixme
diff --git a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
index 7c882c0285..7c882c0285 100644
--- a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
diff --git a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
index 053e4f2a59..053e4f2a59 100644
--- a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
diff --git a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
index 6cc8868397..6cc8868397 100644
--- a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
diff --git a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java.fixme b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java.fixme
index 31c3fd4f00..31c3fd4f00 100644
--- a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java.fixme
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java.fixme
diff --git a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
index dd3d000798..dd3d000798 100644
--- a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
diff --git a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
index bdc9690285..bdc9690285 100644
--- a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
diff --git a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
index 9e9dabcea7..9e9dabcea7 100644
--- a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
diff --git a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
index f3b37c86db..f3b37c86db 100644
--- a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
diff --git a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
index 3a287a5bb7..3a287a5bb7 100644
--- a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
diff --git a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
index cc1f9375c8..cc1f9375c8 100644
--- a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
diff --git a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
index 5ae0616577..5ae0616577 100644
--- a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
diff --git a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
index 9ca490f2d8..9ca490f2d8 100644
--- a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
diff --git a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
index ff6f8c1406..ff6f8c1406 100644
--- a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
diff --git a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
index 0463e7d9f5..0463e7d9f5 100644
--- a/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
diff --git a/branches/sca-equinox/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
index 92a576fb98..92a576fb98 100644
--- a/branches/sca-equinox/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
diff --git a/branches/sca-equinox/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
index 100890e10b..100890e10b 100644
--- a/branches/sca-equinox/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
diff --git a/branches/sca-equinox/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
index 0ba8ade1e0..0ba8ade1e0 100644
--- a/branches/sca-equinox/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
diff --git a/branches/sca-equinox/modules/definitions-xml/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/definitions-xml/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/LICENSE
diff --git a/branches/sca-equinox/modules/definitions-xml/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/META-INF/MANIFEST.MF
index 23b8f26d8b..23b8f26d8b 100644
--- a/branches/sca-equinox/modules/definitions-xml/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/definitions-xml/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/definitions-xml/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/NOTICE
diff --git a/branches/sca-equinox/modules/definitions-xml/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/pom.xml
index d0917b6b6c..d0917b6b6c 100644
--- a/branches/sca-equinox/modules/definitions-xml/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/pom.xml
diff --git a/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
index 6c3dca7bab..6c3dca7bab 100644
--- a/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
diff --git a/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
index c65a9626ab..c65a9626ab 100644
--- a/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
diff --git a/branches/sca-equinox/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index fa33150e87..fa33150e87 100644
--- a/branches/sca-equinox/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 677aff9918..677aff9918 100644
--- a/branches/sca-equinox/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-equinox/modules/definitions-xml/src/main/resources/definitions-xml-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/src/main/resources/definitions-xml-validation-messages.properties
index 857887ec3f..857887ec3f 100644
--- a/branches/sca-equinox/modules/definitions-xml/src/main/resources/definitions-xml-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/src/main/resources/definitions-xml-validation-messages.properties
diff --git a/branches/sca-equinox/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java
index 187b7fa9f8..187b7fa9f8 100644
--- a/branches/sca-equinox/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java
diff --git a/branches/sca-equinox/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
index 2614bbacb4..2614bbacb4 100644
--- a/branches/sca-equinox/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
diff --git a/branches/sca-equinox/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.java
index 3ff8f294f8..3ff8f294f8 100644
--- a/branches/sca-equinox/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.java
diff --git a/branches/sca-equinox/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
index f60047e769..f60047e769 100644
--- a/branches/sca-equinox/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
diff --git a/branches/sca-equinox/modules/definitions/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/definitions/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/definitions/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions/LICENSE
diff --git a/branches/sca-equinox/modules/definitions/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/definitions/META-INF/MANIFEST.MF
index 94962f0fd7..94962f0fd7 100644
--- a/branches/sca-equinox/modules/definitions/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/definitions/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/definitions/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/definitions/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions/NOTICE
diff --git a/branches/sca-equinox/modules/definitions/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/definitions/pom.xml
index ec9e67b3b0..ec9e67b3b0 100644
--- a/branches/sca-equinox/modules/definitions/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions/pom.xml
diff --git a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java b/sca-java-2.x/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
index 156fd0af75..156fd0af75 100644
--- a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
diff --git a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java b/sca-java-2.x/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
index d3373215a2..d3373215a2 100644
--- a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
diff --git a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java b/sca-java-2.x/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
index 59cfa1e205..59cfa1e205 100644
--- a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
diff --git a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java b/sca-java-2.x/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
index e3a11d29aa..e3a11d29aa 100644
--- a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
diff --git a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderImpl.java
index 08a01c020a..08a01c020a 100644
--- a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderImpl.java
diff --git a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java b/sca-java-2.x/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
index 616616ae7a..616616ae7a 100644
--- a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
diff --git a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java b/sca-java-2.x/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
index fdce0060f9..fdce0060f9 100644
--- a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
diff --git a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java b/sca-java-2.x/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
index cd408125d2..cd408125d2 100644
--- a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
diff --git a/branches/sca-equinox/modules/definitions/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.DefinitionsFactory b/sca-java-2.x/branches/sca-equinox/modules/definitions/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.DefinitionsFactory
index 521d94f518..521d94f518 100644
--- a/branches/sca-equinox/modules/definitions/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.DefinitionsFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/definitions/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.DefinitionsFactory
diff --git a/branches/sca-equinox/modules/domain-manager/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/domain-manager/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/LICENSE
diff --git a/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF
index 36ada642c2..36ada642c2 100644
--- a/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/domain-manager/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/domain-manager/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/NOTICE
diff --git a/branches/sca-equinox/modules/domain-manager/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/pom.xml
index 708f97658b..708f97658b 100644
--- a/branches/sca-equinox/modules/domain-manager/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/pom.xml
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
index 0e25068f5f..0e25068f5f 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
index 8dd2320294..8dd2320294 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java
index 320fd97e3b..320fd97e3b 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
index 5321cc2dc1..5321cc2dc1 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java
index a4d7680cb0..a4d7680cb0 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
index 9f1d0c3fa4..9f1d0c3fa4 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java
index 14ab9579f4..14ab9579f4 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
index d2d1e04a79..d2d1e04a79 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfiguration.java b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfiguration.java
index 1831728f07..1831728f07 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfiguration.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfiguration.java
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java
index a5ce6e12d6..a5ce6e12d6 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
index bd330322e5..bd330322e5 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java
index a53250515a..a53250515a 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java
index 2adb623876..2adb623876 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java
index 06d28b0502..06d28b0502 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java
index 53616f3b46..53616f3b46 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
index 23c506446f..23c506446f 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java
index 87fd41a74f..87fd41a74f 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/resources/DomainManager.composite b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/DomainManager.composite
index ba57ea45d1..ba57ea45d1 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/resources/DomainManager.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/DomainManager.composite
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/resources/cloud-gadget.html b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/cloud-gadget.html
index 619df54ede..619df54ede 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/resources/cloud-gadget.html
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/cloud-gadget.html
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/resources/cloud.html b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/cloud.html
index d661d5d38b..d661d5d38b 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/resources/cloud.html
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/cloud.html
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/resources/composite-gadget.html b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/composite-gadget.html
index 82855a410a..82855a410a 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/resources/composite-gadget.html
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/composite-gadget.html
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/resources/composite.html b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/composite.html
index b0631e1d66..b0631e1d66 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/resources/composite.html
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/composite.html
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/resources/files-gadget.html b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/files-gadget.html
index 83315a1957..83315a1957 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/resources/files-gadget.html
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/files-gadget.html
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/resources/files.html b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/files.html
index 37d89e7665..37d89e7665 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/resources/files.html
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/files.html
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/resources/home-gadget.html b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/home-gadget.html
index 05e262e4df..05e262e4df 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/resources/home-gadget.html
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/home-gadget.html
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/resources/home.html b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/home.html
index aad1856621..aad1856621 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/resources/home.html
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/home.html
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/resources/icons/feed-icon.png b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/icons/feed-icon.png
index a59728b2ad..a59728b2ad 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/resources/icons/feed-icon.png
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/icons/feed-icon.png
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/resources/manager.css b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/manager.css
index e080ff1d87..e080ff1d87 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/resources/manager.css
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/manager.css
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/resources/toolbar-gadget.html b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/toolbar-gadget.html
index c9389affc3..c9389affc3 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/resources/toolbar-gadget.html
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/toolbar-gadget.html
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/resources/utils.js b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/utils.js
index 77ed807e85..77ed807e85 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/resources/utils.js
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/utils.js
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/resources/workspace-gadget.html b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/workspace-gadget.html
index a4589b42e6..a4589b42e6 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/resources/workspace-gadget.html
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/workspace-gadget.html
diff --git a/branches/sca-equinox/modules/domain-manager/src/main/resources/workspace.html b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/workspace.html
index 36c02ab1e6..36c02ab1e6 100644
--- a/branches/sca-equinox/modules/domain-manager/src/main/resources/workspace.html
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/main/resources/workspace.html
diff --git a/branches/sca-equinox/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java
index 5e76556a14..5e76556a14 100644
--- a/branches/sca-equinox/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java
diff --git a/branches/sca-equinox/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
index 4eab6dd5e7..4eab6dd5e7 100644
--- a/branches/sca-equinox/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/modules/domain-manager/src/test/resources/contributions/store/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/test/resources/contributions/store/META-INF/sca-contribution.xml
index 48d4be2d6e..48d4be2d6e 100644
--- a/branches/sca-equinox/modules/domain-manager/src/test/resources/contributions/store/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/test/resources/contributions/store/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/modules/domain-manager/src/test/resources/workspace.xml b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/test/resources/workspace.xml
index e6ac7d7701..e6ac7d7701 100644
--- a/branches/sca-equinox/modules/domain-manager/src/test/resources/workspace.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/domain-manager/src/test/resources/workspace.xml
diff --git a/branches/sca-equinox/modules/endpoint/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/endpoint/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/endpoint/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/endpoint/LICENSE
diff --git a/branches/sca-equinox/modules/endpoint/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/endpoint/META-INF/MANIFEST.MF
index 4213af72ac..4213af72ac 100644
--- a/branches/sca-equinox/modules/endpoint/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/endpoint/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/endpoint/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/endpoint/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/endpoint/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/endpoint/NOTICE
diff --git a/branches/sca-equinox/modules/endpoint/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/endpoint/pom.xml
index b866289dfc..b866289dfc 100644
--- a/branches/sca-equinox/modules/endpoint/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/endpoint/pom.xml
diff --git a/branches/sca-equinox/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverFactoryImpl.java
index f0646e934e..f0646e934e 100644
--- a/branches/sca-equinox/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverFactoryImpl.java
diff --git a/branches/sca-equinox/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverImpl.java b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverImpl.java
index b76c4b82f0..b76c4b82f0 100644
--- a/branches/sca-equinox/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverImpl.java
diff --git a/branches/sca-equinox/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
index 50e0a930d2..50e0a930d2 100644
--- a/branches/sca-equinox/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
diff --git a/branches/sca-equinox/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
index 8bac9e01c9..8bac9e01c9 100644
--- a/branches/sca-equinox/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
diff --git a/branches/sca-equinox/modules/endpoint/src/test/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-equinox/modules/endpoint/src/test/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/java/calculator/AddService.java
diff --git a/branches/sca-equinox/modules/endpoint/src/test/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-equinox/modules/endpoint/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/modules/endpoint/src/test/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-equinox/modules/endpoint/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-equinox/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/modules/endpoint/src/test/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-equinox/modules/endpoint/src/test/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-equinox/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/modules/endpoint/src/test/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-equinox/modules/endpoint/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-equinox/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/modules/endpoint/src/test/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-equinox/modules/endpoint/src/test/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-equinox/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java
index dcee1b84a9..dcee1b84a9 100644
--- a/branches/sca-equinox/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java
diff --git a/branches/sca-equinox/modules/endpoint/src/test/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/resources/Calculator.composite
index 3b743f6e26..3b743f6e26 100644
--- a/branches/sca-equinox/modules/endpoint/src/test/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/endpoint/src/test/resources/Calculator.composite
diff --git a/branches/sca-equinox/modules/extensibility-equinox/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/extensibility-equinox/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/extensibility-equinox/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility-equinox/LICENSE
diff --git a/branches/sca-equinox/modules/extensibility-equinox/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/extensibility-equinox/META-INF/MANIFEST.MF
index d054b26acb..d054b26acb 100644
--- a/branches/sca-equinox/modules/extensibility-equinox/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility-equinox/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/extensibility-equinox/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/extensibility-equinox/NOTICE
index 65c52d01c7..65c52d01c7 100644
--- a/branches/sca-equinox/modules/extensibility-equinox/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility-equinox/NOTICE
diff --git a/branches/sca-equinox/modules/extensibility-equinox/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/extensibility-equinox/pom.xml
index 5fe4f2cdf3..5fe4f2cdf3 100644
--- a/branches/sca-equinox/modules/extensibility-equinox/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility-equinox/pom.xml
diff --git a/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java b/sca-java-2.x/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
index bb77b77d0c..bb77b77d0c 100644
--- a/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
diff --git a/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java b/sca-java-2.x/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
index 0c7eaec70b..0c7eaec70b 100644
--- a/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
diff --git a/branches/sca-equinox/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
index 7602b02488..7602b02488 100644
--- a/branches/sca-equinox/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
diff --git a/branches/sca-equinox/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
index c21e4984f5..c21e4984f5 100644
--- a/branches/sca-equinox/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
diff --git a/branches/sca-equinox/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java b/sca-java-2.x/branches/sca-equinox/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
index e000faa447..e000faa447 100644
--- a/branches/sca-equinox/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
diff --git a/branches/sca-equinox/modules/extensibility-equinox/src/test/resources/test-bundle.jar b/sca-java-2.x/branches/sca-equinox/modules/extensibility-equinox/src/test/resources/test-bundle.jar
index afee051f61..afee051f61 100644
--- a/branches/sca-equinox/modules/extensibility-equinox/src/test/resources/test-bundle.jar
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility-equinox/src/test/resources/test-bundle.jar
diff --git a/branches/sca-equinox/modules/extensibility/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/extensibility/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/extensibility/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility/LICENSE
diff --git a/branches/sca-equinox/modules/extensibility/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/extensibility/META-INF/MANIFEST.MF
index 2cca0f0936..2cca0f0936 100644
--- a/branches/sca-equinox/modules/extensibility/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/extensibility/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/extensibility/NOTICE
index b3e4797aaa..b3e4797aaa 100644
--- a/branches/sca-equinox/modules/extensibility/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility/NOTICE
diff --git a/branches/sca-equinox/modules/extensibility/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/extensibility/pom.xml
index 35319afdfd..35319afdfd 100644
--- a/branches/sca-equinox/modules/extensibility/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility/pom.xml
diff --git a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
index 12979723b1..12979723b1 100644
--- a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
diff --git a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultFactoryExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultFactoryExtensionPoint.java
index 1bee91dcea..1bee91dcea 100644
--- a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultFactoryExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultFactoryExtensionPoint.java
diff --git a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
index d84f28f11e..d84f28f11e 100644
--- a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
diff --git a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
index 9906bef909..9906bef909 100644
--- a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
diff --git a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
index f2f67b2d52..f2f67b2d52 100644
--- a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
diff --git a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/FactoryExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/FactoryExtensionPoint.java
index 4d38cb8afe..4d38cb8afe 100644
--- a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/FactoryExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/FactoryExtensionPoint.java
diff --git a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
index dbfd0dcd90..dbfd0dcd90 100644
--- a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
diff --git a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
index ec0f12b8ba..ec0f12b8ba 100644
--- a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
diff --git a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
index 6b14b95666..6b14b95666 100644
--- a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
diff --git a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
index 7d9dc0e9ef..7d9dc0e9ef 100644
--- a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
diff --git a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
index d7ac8b449f..d7ac8b449f 100644
--- a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
diff --git a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
index f89a25d199..f89a25d199 100644
--- a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
diff --git a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
index 10270a0086..10270a0086 100644
--- a/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
diff --git a/branches/sca-equinox/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.FactoryExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.FactoryExtensionPoint
index 3c135aa267..3c135aa267 100644
--- a/branches/sca-equinox/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.FactoryExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.FactoryExtensionPoint
diff --git a/branches/sca-equinox/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
index 42bad63132..42bad63132 100644
--- a/branches/sca-equinox/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
diff --git a/branches/sca-equinox/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
index d769bad283..d769bad283 100644
--- a/branches/sca-equinox/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
diff --git a/branches/sca-equinox/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java
index 4c965420ca..4c965420ca 100644
--- a/branches/sca-equinox/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java
diff --git a/branches/sca-equinox/modules/host-corba-jee/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/host-corba-jee/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/LICENSE
diff --git a/branches/sca-equinox/modules/host-corba-jee/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/META-INF/MANIFEST.MF
index fa8ae15c83..fa8ae15c83 100644
--- a/branches/sca-equinox/modules/host-corba-jee/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/host-corba-jee/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/host-corba-jee/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/NOTICE
diff --git a/branches/sca-equinox/modules/host-corba-jee/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/pom.xml
index 14fe338714..14fe338714 100644
--- a/branches/sca-equinox/modules/host-corba-jee/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/pom.xml
diff --git a/branches/sca-equinox/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/CorbaRuntimeModuleActivator.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/CorbaRuntimeModuleActivator.java
index b5fe9f5d0f..b5fe9f5d0f 100644
--- a/branches/sca-equinox/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/CorbaRuntimeModuleActivator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/CorbaRuntimeModuleActivator.java
diff --git a/branches/sca-equinox/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java
index 7e714c1ca5..7e714c1ca5 100644
--- a/branches/sca-equinox/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java
diff --git a/branches/sca-equinox/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 3762550c01..3762550c01 100644
--- a/branches/sca-equinox/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java
index fd952a02c7..fd952a02c7 100644
--- a/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java
diff --git a/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java
index a0b9b7c514..a0b9b7c514 100644
--- a/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java
diff --git a/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java
index f480235fa8..f480235fa8 100644
--- a/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java
diff --git a/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java
index f9f3d4789e..f9f3d4789e 100644
--- a/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java
diff --git a/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java
index 9ed4c81248..9ed4c81248 100644
--- a/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java
diff --git a/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java
index 357c1eddb0..357c1eddb0 100644
--- a/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java
diff --git a/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java
index c2d4877791..c2d4877791 100644
--- a/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java
diff --git a/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java
index 9846748775..9846748775 100644
--- a/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java
diff --git a/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java
index cd722214ed..cd722214ed 100644
--- a/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java
diff --git a/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java
index 6195f3af9c..6195f3af9c 100644
--- a/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java
diff --git a/branches/sca-equinox/modules/host-corba-jee/src/test/resources/general.idl b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/test/resources/general.idl
index 9194a37334..9194a37334 100644
--- a/branches/sca-equinox/modules/host-corba-jee/src/test/resources/general.idl
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jee/src/test/resources/general.idl
diff --git a/branches/sca-equinox/modules/host-corba-jse-tns/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse-tns/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/host-corba-jse-tns/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse-tns/LICENSE
diff --git a/branches/sca-equinox/modules/host-corba-jse-tns/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse-tns/META-INF/MANIFEST.MF
index c0071d929f..c0071d929f 100644
--- a/branches/sca-equinox/modules/host-corba-jse-tns/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse-tns/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/host-corba-jse-tns/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse-tns/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/host-corba-jse-tns/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse-tns/NOTICE
diff --git a/branches/sca-equinox/modules/host-corba-jse-tns/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse-tns/pom.xml
index 9877bb6ab9..9877bb6ab9 100644
--- a/branches/sca-equinox/modules/host-corba-jse-tns/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse-tns/pom.xml
diff --git a/branches/sca-equinox/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java
index 312d739c53..312d739c53 100644
--- a/branches/sca-equinox/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java
diff --git a/branches/sca-equinox/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java
index 2dc2c7ddd4..2dc2c7ddd4 100644
--- a/branches/sca-equinox/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java
diff --git a/branches/sca-equinox/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 906ec4efce..906ec4efce 100644
--- a/branches/sca-equinox/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-equinox/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java
index 39d9191f80..39d9191f80 100644
--- a/branches/sca-equinox/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java
diff --git a/branches/sca-equinox/modules/host-corba-jse/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/host-corba-jse/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/LICENSE
diff --git a/branches/sca-equinox/modules/host-corba-jse/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/META-INF/MANIFEST.MF
index 26d0f037e8..26d0f037e8 100644
--- a/branches/sca-equinox/modules/host-corba-jse/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/host-corba-jse/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/host-corba-jse/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/NOTICE
diff --git a/branches/sca-equinox/modules/host-corba-jse/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/pom.xml
index 6c51c8f367..6c51c8f367 100644
--- a/branches/sca-equinox/modules/host-corba-jse/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/pom.xml
diff --git a/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java
index 252a1512e4..252a1512e4 100644
--- a/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java
diff --git a/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java
index 015644e19d..015644e19d 100644
--- a/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java
diff --git a/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java
index 59f0ce9a53..59f0ce9a53 100644
--- a/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java
diff --git a/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java
index 599f5bca54..599f5bca54 100644
--- a/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java
diff --git a/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
index 77617a6c5c..77617a6c5c 100644
--- a/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
diff --git a/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java
index a7164e9ef3..a7164e9ef3 100644
--- a/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java
diff --git a/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java
index 444143f173..444143f173 100644
--- a/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java
diff --git a/branches/sca-equinox/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index a96baed33e..a96baed33e 100644
--- a/branches/sca-equinox/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
index 8084e39956..8084e39956 100644
--- a/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
diff --git a/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java
index 8d1a9db9e9..8d1a9db9e9 100644
--- a/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java
diff --git a/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java
index fe85dc7743..fe85dc7743 100644
--- a/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java
diff --git a/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java
index 305a4d7b97..305a4d7b97 100644
--- a/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java
diff --git a/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java
index f557d3e020..f557d3e020 100644
--- a/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java
diff --git a/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java
index f993066dab..f993066dab 100644
--- a/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java
diff --git a/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java
index 30a77deaf5..30a77deaf5 100644
--- a/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java
diff --git a/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java
index 0ebde8ef0d..0ebde8ef0d 100644
--- a/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java
diff --git a/branches/sca-equinox/modules/host-corba-jse/src/test/resources/general.idl b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/test/resources/general.idl
index f67566deb8..f67566deb8 100644
--- a/branches/sca-equinox/modules/host-corba-jse/src/test/resources/general.idl
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba-jse/src/test/resources/general.idl
diff --git a/branches/sca-equinox/modules/host-corba/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/host-corba/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/host-corba/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba/LICENSE
diff --git a/branches/sca-equinox/modules/host-corba/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/host-corba/META-INF/MANIFEST.MF
index 8e0abcaa22..8e0abcaa22 100644
--- a/branches/sca-equinox/modules/host-corba/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/host-corba/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/host-corba/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/host-corba/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba/NOTICE
diff --git a/branches/sca-equinox/modules/host-corba/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/host-corba/pom.xml
index daeed00db4..daeed00db4 100644
--- a/branches/sca-equinox/modules/host-corba/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba/pom.xml
diff --git a/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
index eb49f3f841..eb49f3f841 100644
--- a/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
diff --git a/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java
index 049bfdb6cd..049bfdb6cd 100644
--- a/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java
diff --git a/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java
index 067b9193c5..067b9193c5 100644
--- a/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java
diff --git a/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java
index b90fe9c78b..b90fe9c78b 100644
--- a/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java
diff --git a/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java
index a380fd6d79..a380fd6d79 100644
--- a/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java
diff --git a/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java
index 438734086d..438734086d 100644
--- a/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java
diff --git a/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java
index 7e043667a9..7e043667a9 100644
--- a/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java
diff --git a/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java
index 6989b3ad06..6989b3ad06 100755
--- a/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java
diff --git a/branches/sca-equinox/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint
index a72bed4ea8..a72bed4ea8 100644
--- a/branches/sca-equinox/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint
diff --git a/branches/sca-equinox/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java
index 4e076f9342..4e076f9342 100644
--- a/branches/sca-equinox/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java
diff --git a/branches/sca-equinox/modules/host-http/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/host-http/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/host-http/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-http/LICENSE
diff --git a/branches/sca-equinox/modules/host-http/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/host-http/META-INF/MANIFEST.MF
index 328bc7b1f5..328bc7b1f5 100644
--- a/branches/sca-equinox/modules/host-http/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-http/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/host-http/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/host-http/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/host-http/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-http/NOTICE
diff --git a/branches/sca-equinox/modules/host-http/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/host-http/pom.xml
index 1874c0f878..1874c0f878 100644
--- a/branches/sca-equinox/modules/host-http/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-http/pom.xml
diff --git a/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java b/sca-java-2.x/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
index 3de0b9f5a7..3de0b9f5a7 100644
--- a/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
diff --git a/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
index 5e6de0b29b..5e6de0b29b 100644
--- a/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
diff --git a/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java b/sca-java-2.x/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
index 4be5de4100..4be5de4100 100644
--- a/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
diff --git a/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java b/sca-java-2.x/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
index e5dbd59a07..e5dbd59a07 100644
--- a/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
diff --git a/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
index fbd085ba2b..fbd085ba2b 100644
--- a/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
diff --git a/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java b/sca-java-2.x/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
index ae66c44c3e..ae66c44c3e 100644
--- a/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
diff --git a/branches/sca-equinox/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
index 44f4550b40..44f4550b40 100644
--- a/branches/sca-equinox/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
diff --git a/branches/sca-equinox/modules/host-jetty/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/host-jetty/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/LICENSE
diff --git a/branches/sca-equinox/modules/host-jetty/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/META-INF/MANIFEST.MF
index 971164f399..971164f399 100644
--- a/branches/sca-equinox/modules/host-jetty/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/host-jetty/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/host-jetty/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/NOTICE
diff --git a/branches/sca-equinox/modules/host-jetty/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/pom.xml
index af7adc809f..af7adc809f 100644
--- a/branches/sca-equinox/modules/host-jetty/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/pom.xml
diff --git a/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
index 4f5bfb3c62..4f5bfb3c62 100644
--- a/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
diff --git a/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
index 1ecf1bca1b..1ecf1bca1b 100644
--- a/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
diff --git a/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java
index 31c8397f8b..31c8397f8b 100644
--- a/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java
diff --git a/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
index dfb34f11a5..dfb34f11a5 100644
--- a/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
diff --git a/branches/sca-equinox/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index e826f5a496..e826f5a496 100644
--- a/branches/sca-equinox/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-equinox/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
index 020dd4af0e..020dd4af0e 100644
--- a/branches/sca-equinox/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
diff --git a/branches/sca-equinox/modules/host-jetty/src/test/resources/content/test.html b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-equinox/modules/host-jetty/src/test/resources/content/test.html
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/src/test/resources/content/test.html
diff --git a/branches/sca-equinox/modules/host-jetty/src/test/resources/tuscany.keyStore b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/src/test/resources/tuscany.keyStore
index 7ea23f7ff4..7ea23f7ff4 100644
--- a/branches/sca-equinox/modules/host-jetty/src/test/resources/tuscany.keyStore
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-jetty/src/test/resources/tuscany.keyStore
diff --git a/branches/sca-equinox/modules/host-rmi/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/host-rmi/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/LICENSE
diff --git a/branches/sca-equinox/modules/host-rmi/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/META-INF/MANIFEST.MF
index e85017a67f..e85017a67f 100644
--- a/branches/sca-equinox/modules/host-rmi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/host-rmi/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/host-rmi/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/NOTICE
diff --git a/branches/sca-equinox/modules/host-rmi/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/pom.xml
index 638a795d8a..638a795d8a 100644
--- a/branches/sca-equinox/modules/host-rmi/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/pom.xml
diff --git a/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
index 359ef488d4..359ef488d4 100644
--- a/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
diff --git a/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
index 3ac086a2ee..3ac086a2ee 100644
--- a/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
diff --git a/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
index 29b4e195c7..29b4e195c7 100644
--- a/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
diff --git a/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
index b95b91f003..b95b91f003 100644
--- a/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
diff --git a/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
index 959eb72f6e..959eb72f6e 100644
--- a/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
diff --git a/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
index 40d6013940..40d6013940 100644
--- a/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
diff --git a/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
index 998287f998..998287f998 100644
--- a/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
diff --git a/branches/sca-equinox/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
index 014c5391b8..014c5391b8 100644
--- a/branches/sca-equinox/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
diff --git a/branches/sca-equinox/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
index 88f3e89489..88f3e89489 100644
--- a/branches/sca-equinox/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
diff --git a/branches/sca-equinox/modules/host-tomcat/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/host-tomcat/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/LICENSE
diff --git a/branches/sca-equinox/modules/host-tomcat/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/META-INF/MANIFEST.MF
index 457b27b3b6..457b27b3b6 100644
--- a/branches/sca-equinox/modules/host-tomcat/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/host-tomcat/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/host-tomcat/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/NOTICE
diff --git a/branches/sca-equinox/modules/host-tomcat/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/pom.xml
index e350031b9e..e350031b9e 100644
--- a/branches/sca-equinox/modules/host-tomcat/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/pom.xml
diff --git a/branches/sca-equinox/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
index a0b384d554..a0b384d554 100644
--- a/branches/sca-equinox/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
diff --git a/branches/sca-equinox/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
index 5d9b65503a..5d9b65503a 100644
--- a/branches/sca-equinox/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
diff --git a/branches/sca-equinox/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
index 5ea1701c05..5ea1701c05 100644
--- a/branches/sca-equinox/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
diff --git a/branches/sca-equinox/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
index 070dffdce6..070dffdce6 100644
--- a/branches/sca-equinox/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
diff --git a/branches/sca-equinox/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index f0f4e17507..f0f4e17507 100644
--- a/branches/sca-equinox/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-equinox/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
index afbec52cd9..afbec52cd9 100644
--- a/branches/sca-equinox/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
diff --git a/branches/sca-equinox/modules/host-tomcat/src/test/resources/content/test.html b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-equinox/modules/host-tomcat/src/test/resources/content/test.html
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/src/test/resources/content/test.html
diff --git a/branches/sca-equinox/modules/host-tomcat/src/test/resources/tuscany.keyStore b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/src/test/resources/tuscany.keyStore
index 7ea23f7ff4..7ea23f7ff4 100644
--- a/branches/sca-equinox/modules/host-tomcat/src/test/resources/tuscany.keyStore
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-tomcat/src/test/resources/tuscany.keyStore
diff --git a/branches/sca-equinox/modules/host-webapp-junit/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/host-webapp-junit/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/host-webapp-junit/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-webapp-junit/LICENSE
diff --git a/branches/sca-equinox/modules/host-webapp-junit/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/host-webapp-junit/META-INF/MANIFEST.MF
index eec19db794..eec19db794 100644
--- a/branches/sca-equinox/modules/host-webapp-junit/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-webapp-junit/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/host-webapp-junit/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/host-webapp-junit/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/host-webapp-junit/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-webapp-junit/NOTICE
diff --git a/branches/sca-equinox/modules/host-webapp-junit/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/host-webapp-junit/pom.xml
index 0de18806b6..0de18806b6 100644
--- a/branches/sca-equinox/modules/host-webapp-junit/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-webapp-junit/pom.xml
diff --git a/branches/sca-equinox/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java b/sca-java-2.x/branches/sca-equinox/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
index b2d3d0abf1..b2d3d0abf1 100644
--- a/branches/sca-equinox/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
diff --git a/branches/sca-equinox/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java b/sca-java-2.x/branches/sca-equinox/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java
index 72ec478cd6..72ec478cd6 100644
--- a/branches/sca-equinox/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java
diff --git a/branches/sca-equinox/modules/host-webapp/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/host-webapp/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/LICENSE
diff --git a/branches/sca-equinox/modules/host-webapp/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/META-INF/MANIFEST.MF
index 978516584a..978516584a 100644
--- a/branches/sca-equinox/modules/host-webapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/host-webapp/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/host-webapp/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/NOTICE
diff --git a/branches/sca-equinox/modules/host-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/pom.xml
index 4c30161f04..4c30161f04 100644
--- a/branches/sca-equinox/modules/host-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/pom.xml
diff --git a/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
index cb4369fc01..cb4369fc01 100644
--- a/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
diff --git a/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java
index 88caa33f2a..88caa33f2a 100644
--- a/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java
diff --git a/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
index f14dfac58b..f14dfac58b 100644
--- a/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
diff --git a/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
index 729810b0fb..729810b0fb 100644
--- a/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
diff --git a/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTEI.java b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTEI.java
index 6e1b187a48..6e1b187a48 100644
--- a/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTEI.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTEI.java
diff --git a/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java
index 704f45b706..704f45b706 100644
--- a/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java
diff --git a/branches/sca-equinox/modules/host-webapp/src/main/resources/META-INF/sca.tld b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/src/main/resources/META-INF/sca.tld
index 089cdc1607..089cdc1607 100644
--- a/branches/sca-equinox/modules/host-webapp/src/main/resources/META-INF/sca.tld
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/src/main/resources/META-INF/sca.tld
diff --git a/branches/sca-equinox/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index d99fdf257e..d99fdf257e 100644
--- a/branches/sca-equinox/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/branches/sca-equinox/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/LICENSE
index baba9ca048..baba9ca048 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/LICENSE
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
index e2842f488c..e2842f488c 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/NOTICE
index a2f696be26..a2f696be26 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/NOTICE
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/pom.xml
index 34c9f9c7a5..34c9f9c7a5 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/pom.xml
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
index 20373d0819..20373d0819 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
index ed327331db..ed327331db 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
index 11af0f8b50..11af0f8b50 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
index 3f2db7b244..3f2db7b244 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
index a6428f6984..a6428f6984 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
index b03f69d9aa..b03f69d9aa 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
index 15e9229601..15e9229601 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
index 2fa91e4e86..2fa91e4e86 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
index 1ec82390cf..1ec82390cf 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
index a928379ba9..a928379ba9 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
index 328403e626..328403e626 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
index 8f8f608217..8f8f608217 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
index c626e6a8e3..c626e6a8e3 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
index c644b6a965..c644b6a965 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
index c5d6555a24..c5d6555a24 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
index f301082d59..f301082d59 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 3bce8aa9ab..3bce8aa9ab 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
index 0f59990377..0f59990377 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/test/resources/helloworld/deploy.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/test/resources/helloworld/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/test/resources/helloworld/deploy.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/test/resources/helloworld/deploy.xml
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/test/resources/helloworld/greetings.wsdl b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/test/resources/helloworld/greetings.wsdl
index bcd3ea6afa..bcd3ea6afa 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/test/resources/helloworld/greetings.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/test/resources/helloworld/greetings.wsdl
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.bpel
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.wsdl
index 1d71727b2d..1d71727b2d 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.wsdl
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/src/test/resources/log4j.properties b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/test/resources/log4j.properties
index 82b3c09723..82b3c09723 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/src/test/resources/log4j.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel-ode/src/test/resources/log4j.properties
diff --git a/branches/sca-equinox/modules/implementation-bpel/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/LICENSE
index baba9ca048..baba9ca048 100644
--- a/branches/sca-equinox/modules/implementation-bpel/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/LICENSE
diff --git a/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF
index f18b080901..f18b080901 100644
--- a/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/implementation-bpel/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/NOTICE
index a2f696be26..a2f696be26 100644
--- a/branches/sca-equinox/modules/implementation-bpel/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/NOTICE
diff --git a/branches/sca-equinox/modules/implementation-bpel/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/pom.xml
index 90fd4f6370..90fd4f6370 100644
--- a/branches/sca-equinox/modules/implementation-bpel/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/pom.xml
diff --git a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
index 9f8f9c0e9a..9f8f9c0e9a 100644
--- a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
diff --git a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
index d54add5391..d54add5391 100644
--- a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
diff --git a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
index a6518ed11b..a6518ed11b 100644
--- a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
diff --git a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELFactoryImpl.java
index f9b95c7da8..f9b95c7da8 100644
--- a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELFactoryImpl.java
diff --git a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
index f1c943e49c..f1c943e49c 100644
--- a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
diff --git a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
index 5ce4f91376..5ce4f91376 100644
--- a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
diff --git a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
index 43606cb216..43606cb216 100644
--- a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
index 92c38123a1..92c38123a1 100644
--- a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java
index bf0020323c..bf0020323c 100644
--- a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java
diff --git a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
index b7f5d1d3f2..b7f5d1d3f2 100644
--- a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
diff --git a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
index fdaf98a97f..fdaf98a97f 100644
--- a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
diff --git a/branches/sca-equinox/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 03ef3e3a7f..03ef3e3a7f 100644
--- a/branches/sca-equinox/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index f6fd442f56..f6fd442f56 100644
--- a/branches/sca-equinox/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-equinox/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
index 4276e938f1..4276e938f1 100644
--- a/branches/sca-equinox/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
diff --git a/branches/sca-equinox/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties
index b6d8bdc0f1..b6d8bdc0f1 100644
--- a/branches/sca-equinox/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties
diff --git a/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
index e355b7adf9..e355b7adf9 100644
--- a/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
index 28cc562a3b..28cc562a3b 100644
--- a/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/branches/sca-equinox/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
diff --git a/branches/sca-equinox/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
index 1d71727b2d..1d71727b2d 100644
--- a/branches/sca-equinox/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
diff --git a/branches/sca-equinox/modules/implementation-ejb/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/implementation-ejb/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/LICENSE
diff --git a/branches/sca-equinox/modules/implementation-ejb/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/META-INF/MANIFEST.MF
index 3aff9309c7..3aff9309c7 100644
--- a/branches/sca-equinox/modules/implementation-ejb/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/implementation-ejb/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/implementation-ejb/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/NOTICE
diff --git a/branches/sca-equinox/modules/implementation-ejb/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/pom.xml
index 71b3f47d7e..71b3f47d7e 100644
--- a/branches/sca-equinox/modules/implementation-ejb/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/pom.xml
diff --git a/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java
index 0d3b05f0c9..0d3b05f0c9 100644
--- a/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java
diff --git a/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java
index bf9e13069b..bf9e13069b 100644
--- a/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java
diff --git a/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java
index 050d0cf17a..050d0cf17a 100644
--- a/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java
diff --git a/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java
index bf2e6354d5..bf2e6354d5 100644
--- a/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java
diff --git a/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
index 573bd7ef17..573bd7ef17 100644
--- a/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ae6db609a2..ae6db609a2 100644
--- a/branches/sca-equinox/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory
index fb828707a6..fb828707a6 100644
--- a/branches/sca-equinox/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory
diff --git a/branches/sca-equinox/modules/implementation-ejb/src/main/resources/impl-ejb-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/src/main/resources/impl-ejb-validation-messages.properties
index 4eaf2b9007..4eaf2b9007 100644
--- a/branches/sca-equinox/modules/implementation-ejb/src/main/resources/impl-ejb-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/src/main/resources/impl-ejb-validation-messages.properties
diff --git a/branches/sca-equinox/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
index ffbdf1d54c..ffbdf1d54c 100644
--- a/branches/sca-equinox/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java
index 8ba43dd635..8ba43dd635 100644
--- a/branches/sca-equinox/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-ejb/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite
index 0c1368c4dd..0c1368c4dd 100644
--- a/branches/sca-equinox/modules/implementation-ejb/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-ejb/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/LICENSE
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/META-INF/MANIFEST.MF
index 6a859242ec..6a859242ec 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/NOTICE
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/pom.xml
index 6b8cfc9322..6b8cfc9322 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/pom.xml
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
index ac8af3ed64..ac8af3ed64 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
index df21e013f1..df21e013f1 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
index b5d3254fa0..b5d3254fa0 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
index 5285caa481..5285caa481 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
index 2513c63e38..2513c63e38 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
index d8eef18c74..d8eef18c74 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
index ffce7ce467..ffce7ce467 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
index dd454be7c5..dd454be7c5 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
index 4a8c8f31b8..4a8c8f31b8 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
index 4d062859b9..4d062859b9 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
index 5aeebcca36..5aeebcca36 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
index 40aefed219..40aefed219 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
index 9f587f58de..9f587f58de 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
index baf9eb9cc1..baf9eb9cc1 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
index ca9c08fe63..ca9c08fe63 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
index 70c368a0e6..70c368a0e6 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
index 17450f43cb..17450f43cb 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
index 5d4d999453..5d4d999453 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
index f94b24762a..f94b24762a 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
index 25c09231c5..25c09231c5 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
index e6ebb5abc3..e6ebb5abc3 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
index 135fde09ff..135fde09ff 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
index ef4e67d79a..ef4e67d79a 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
index 2903cc6fc8..2903cc6fc8 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
index 0e35e32f01..0e35e32f01 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
index 4a5ad98e5b..4a5ad98e5b 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
index 25d538cff4..25d538cff4 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
index b83dba42cc..b83dba42cc 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
index 9b78439012..9b78439012 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
index 0200fcf385..0200fcf385 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
index ee3507ef80..ee3507ef80 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
index 515a7c8a43..515a7c8a43 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
index a7b175cf9b..a7b175cf9b 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
index 8c85b46c65..8c85b46c65 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
index 3555eb19f1..3555eb19f1 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 0871ddf4be..0871ddf4be 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
index ba8da101c6..ba8da101c6 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java.fixme b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java.fixme
index 628a308c86..628a308c86 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java.fixme
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java.fixme
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java.fixme b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java.fixme
index 29dcfa8169..29dcfa8169 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java.fixme
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java.fixme
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
index cc852cc677..cc852cc677 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java.fixme b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java.fixme
index 366f21d9f0..366f21d9f0 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java.fixme
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java.fixme
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
index 4de0a4e8c7..4de0a4e8c7 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
index 214779ed3f..214779ed3f 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
index c470b8cf3d..c470b8cf3d 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java.fixme b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java.fixme
index ed7a0e7d03..ed7a0e7d03 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java.fixme
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java.fixme
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
index c1650c3a83..c1650c3a83 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
index 40ad1b1e95..40ad1b1e95 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
index de371e09bb..de371e09bb 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
index 1fb7abb917..1fb7abb917 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
index e993cdd382..e993cdd382 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
index 82264c77c9..82264c77c9 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
index a5e12d181c..a5e12d181c 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
index b104f1a6c0..b104f1a6c0 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
index 408cedb8be..408cedb8be 100644
--- a/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
diff --git a/branches/sca-equinox/modules/implementation-java-xml/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/LICENSE
diff --git a/branches/sca-equinox/modules/implementation-java-xml/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/META-INF/MANIFEST.MF
index 0dd3619b87..0dd3619b87 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/implementation-java-xml/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/NOTICE
diff --git a/branches/sca-equinox/modules/implementation-java-xml/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/pom.xml
index 392faeb350..392faeb350 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/pom.xml
diff --git a/branches/sca-equinox/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
index ecbf0c4c78..ecbf0c4c78 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
diff --git a/branches/sca-equinox/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
index f26395cbc1..f26395cbc1 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ff43eebcfc..ff43eebcfc 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties
index 210b715da8..210b715da8 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties
diff --git a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/AddService.java
index 9c22177684..9c22177684 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/AddService.java
diff --git a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
index 3f28d740a7..3f28d740a7 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
index e0cf23dc17..e0cf23dc17 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
index c1fceb575d..c1fceb575d 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
index 9599c86292..9599c86292 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
index e1f35f99b5..e1f35f99b5 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
index 7a3d06c15e..7a3d06c15e 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
index d621407908..d621407908 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
index 21af91f392..21af91f392 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
index 4fed0a8c6a..4fed0a8c6a 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
index 5d443c8a4c..5d443c8a4c 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
index 27e3579c35..27e3579c35 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
diff --git a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
index 5ac3d0dcb4..5ac3d0dcb4 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
index a58fa0c072..a58fa0c072 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
diff --git a/branches/sca-equinox/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
index cddc134c2c..cddc134c2c 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
diff --git a/branches/sca-equinox/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
index 9147133d5d..9147133d5d 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
diff --git a/branches/sca-equinox/modules/implementation-java/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/implementation-java/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/LICENSE
diff --git a/branches/sca-equinox/modules/implementation-java/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/META-INF/MANIFEST.MF
index d86b52e726..d86b52e726 100644
--- a/branches/sca-equinox/modules/implementation-java/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/implementation-java/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/implementation-java/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/NOTICE
diff --git a/branches/sca-equinox/modules/implementation-java/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/pom.xml
index 80a8c7a143..80a8c7a143 100644
--- a/branches/sca-equinox/modules/implementation-java/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/pom.xml
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
index c8b7c072ac..c8b7c072ac 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
index e44ebd7c91..e44ebd7c91 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
index 2198a632c0..2198a632c0 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaConstructorImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaConstructorImpl.java
index 4d53c45f1f..4d53c45f1f 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaConstructorImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaConstructorImpl.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java
index c3709efb0a..c3709efb0a 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
index cfb8aed338..cfb8aed338 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationActivator.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationActivator.java
index 39484b8840..39484b8840 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationActivator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationActivator.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
index 8228c80372..8228c80372 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaParameterImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaParameterImpl.java
index 80911a9552..80911a9552 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaParameterImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaParameterImpl.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaResourceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaResourceImpl.java
index 19a9f38549..19a9f38549 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaResourceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaResourceImpl.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaScopeImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaScopeImpl.java
index b3ee8e8b2b..b3ee8e8b2b 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaScopeImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaScopeImpl.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
index 97773879fa..97773879fa 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
index 6503aa2889..6503aa2889 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
index 0cc78498e6..0cc78498e6 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
index a0b8b1dba0..a0b8b1dba0 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/BaseJavaClassVisitor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/BaseJavaClassVisitor.java
index 39b20d41eb..39b20d41eb 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/BaseJavaClassVisitor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/BaseJavaClassVisitor.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
index 4b0f5bea55..4b0f5bea55 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java
index d36bf7397e..d36bf7397e 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
index 9e1d8c8b0c..9e1d8c8b0c 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
index 16de6d951a..16de6d951a 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
index c6e6b6e4d6..c6e6b6e4d6 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
index 69798be864..69798be864 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
index 1421adc3d6..1421adc3d6 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
index f43b1fa22b..f43b1fa22b 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
index d4f7ee0bce..d4f7ee0bce 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
index 327bd97564..327bd97564 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
index 7f26846969..7f26846969 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
index 88a245cbf3..88a245cbf3 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
index 9b834e7e87..9b834e7e87 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
index 4325faef26..4325faef26 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
index b9e1923e73..b9e1923e73 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
index 300ad6817e..300ad6817e 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
index 2d177b3f76..2d177b3f76 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
index 650d6dd251..650d6dd251 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
index 7d1d6c83ce..7d1d6c83ce 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
index 9fe2fcd468..9fe2fcd468 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
index f5696122df..f5696122df 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
index 6a0d60c92f..6a0d60c92f 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
index 8f50852c2d..8f50852c2d 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
index 54f7dfad1e..54f7dfad1e 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
index 25196c56e5..25196c56e5 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
index ccfbaf0043..ccfbaf0043 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
index e130f4221d..e130f4221d 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
index 927c7f1565..927c7f1565 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
index 91b97b2caf..91b97b2caf 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
index a1e1d01ab3..a1e1d01ab3 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
index 976b4da120..976b4da120 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
index e77a6beb0d..e77a6beb0d 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
index debb5cbacc..debb5cbacc 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
index 7147da55b4..7147da55b4 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
index 453cfa35fe..453cfa35fe 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
index c2e1e33432..c2e1e33432 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
index cf1b4a9830..cf1b4a9830 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
index 911f1f1bb9..911f1f1bb9 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
index 3d43e39ce8..3d43e39ce8 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
index dbb59d558a..dbb59d558a 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
index 7d7e0df7fc..7d7e0df7fc 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
index 3d5faf4f54..3d5faf4f54 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
index e1ca3ea565..e1ca3ea565 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
index 57d224b2bf..57d224b2bf 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 856d4e55b2..856d4e55b2 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-equinox/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
index dc9de12632..dc9de12632 100644
--- a/branches/sca-equinox/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
index 805ea494b2..805ea494b2 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
index 2383f1ba60..2383f1ba60 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
index e5abb07760..e5abb07760 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
index a3c87afe63..a3c87afe63 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
index 690869ccb8..690869ccb8 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
index 8c10df2146..8c10df2146 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
index b3bfee40e8..b3bfee40e8 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
index f77c9abad9..f77c9abad9 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
index c6b2626e9c..c6b2626e9c 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
index a682f8b2f0..a682f8b2f0 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
index aa2671071c..aa2671071c 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
index ffc67325fa..ffc67325fa 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
index 09bcc7ab6c..09bcc7ab6c 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
index 58ff81a06c..58ff81a06c 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
index 7a6fcbaacf..7a6fcbaacf 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
index fbc971a3e2..fbc971a3e2 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
index 315c99c06c..315c99c06c 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
index 70c615ca24..70c615ca24 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
index aad6b96cf9..aad6b96cf9 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
index 4a625982b0..4a625982b0 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
index ad8edd83ea..ad8edd83ea 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
index d68b1530f0..d68b1530f0 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
index 207d00e945..207d00e945 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
index 471d4366f6..471d4366f6 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
index 10f0500e4d..10f0500e4d 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
index aea90aa6eb..aea90aa6eb 100644
--- a/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-node-runtime/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/implementation-node-runtime/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/LICENSE
diff --git a/branches/sca-equinox/modules/implementation-node-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/META-INF/MANIFEST.MF
index 8c1d6f198f..8c1d6f198f 100644
--- a/branches/sca-equinox/modules/implementation-node-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/implementation-node-runtime/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-equinox/modules/implementation-node-runtime/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/NOTICE
diff --git a/branches/sca-equinox/modules/implementation-node-runtime/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/pom.xml
index ec3c09ae64..ec3c09ae64 100644
--- a/branches/sca-equinox/modules/implementation-node-runtime/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/pom.xml
diff --git a/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
index 48abc21520..48abc21520 100644
--- a/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
diff --git a/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
index 8552c3434d..8552c3434d 100644
--- a/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
diff --git a/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
index 62a822a85e..62a822a85e 100644
--- a/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
diff --git a/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java
index 5895a8614d..5895a8614d 100644
--- a/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java
diff --git a/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
index 6cdb18938e..6cdb18938e 100644
--- a/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
diff --git a/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java
index e2a3e4df92..e2a3e4df92 100644
--- a/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java
diff --git a/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java
index f6a601a3cd..f6a601a3cd 100644
--- a/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java
diff --git a/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
index 43c91ac9af..43c91ac9af 100644
--- a/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
diff --git a/branches/sca-equinox/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 306b53be5b..306b53be5b 100644
--- a/branches/sca-equinox/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-equinox/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
index 8e016054c4..8e016054c4 100644
--- a/branches/sca-equinox/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-node-runtime/src/test/resources/TestComposite.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
index 55644c27e5..55644c27e5 100644
--- a/branches/sca-equinox/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
diff --git a/branches/sca-equinox/modules/implementation-node-runtime/src/test/resources/TestNode.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/test/resources/TestNode.composite
index d4dc62a42d..d4dc62a42d 100644
--- a/branches/sca-equinox/modules/implementation-node-runtime/src/test/resources/TestNode.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node-runtime/src/test/resources/TestNode.composite
diff --git a/branches/sca-equinox/modules/implementation-node/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/implementation-node/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/LICENSE
diff --git a/branches/sca-equinox/modules/implementation-node/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/META-INF/MANIFEST.MF
index 2ac3da8c1d..2ac3da8c1d 100644
--- a/branches/sca-equinox/modules/implementation-node/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/implementation-node/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/implementation-node/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/NOTICE
diff --git a/branches/sca-equinox/modules/implementation-node/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/pom.xml
index 0ebf32f68c..0ebf32f68c 100644
--- a/branches/sca-equinox/modules/implementation-node/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/pom.xml
diff --git a/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
index d4755f4071..d4755f4071 100644
--- a/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
diff --git a/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
index 527698ea91..527698ea91 100644
--- a/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
diff --git a/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
index 9c4fed689b..9c4fed689b 100644
--- a/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
diff --git a/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java
index 14046065b5..14046065b5 100644
--- a/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java
diff --git a/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
index 1d183513b4..1d183513b4 100644
--- a/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
diff --git a/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
index 94ea610314..94ea610314 100644
--- a/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
diff --git a/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
index 8f6315d969..8f6315d969 100644
--- a/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
diff --git a/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
index 8ed57a8a0e..8ed57a8a0e 100644
--- a/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
index 8d2650ec85..8d2650ec85 100644
--- a/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
index 1ad6df149d..1ad6df149d 100644
--- a/branches/sca-equinox/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
diff --git a/branches/sca-equinox/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 9378db0875..9378db0875 100644
--- a/branches/sca-equinox/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
index b8a63a3b16..b8a63a3b16 100644
--- a/branches/sca-equinox/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
diff --git a/branches/sca-equinox/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
index 3c6588eefc..3c6588eefc 100644
--- a/branches/sca-equinox/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
diff --git a/branches/sca-equinox/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
index 5ff5d2bf7f..5ff5d2bf7f 100644
--- a/branches/sca-equinox/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
index c5e6a40f89..c5e6a40f89 100644
--- a/branches/sca-equinox/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
index 55644c27e5..55644c27e5 100644
--- a/branches/sca-equinox/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
diff --git a/branches/sca-equinox/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
index 92787d3ac1..92787d3ac1 100644
--- a/branches/sca-equinox/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
diff --git a/branches/sca-equinox/modules/implementation-osgi/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/LICENSE
index 6b0b1270ff..6b0b1270ff 100644
--- a/branches/sca-equinox/modules/implementation-osgi/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/LICENSE
diff --git a/branches/sca-equinox/modules/implementation-osgi/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/implementation-osgi/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/NOTICE
diff --git a/branches/sca-equinox/modules/implementation-osgi/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/pom.xml
index 987efc3378..987efc3378 100644
--- a/branches/sca-equinox/modules/implementation-osgi/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/pom.xml
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
index 7bcb0a1da5..7bcb0a1da5 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java
index 33c790585c..33c790585c 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java
index 0264f0b102..0264f0b102 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
index 38befa611b..38befa611b 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
index fe3efd22cd..fe3efd22cd 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java
index 5664c77618..5664c77618 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java
index 814d37f203..814d37f203 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java
index e775041592..e775041592 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java
index deb44d26fb..deb44d26fb 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java
index deb39a47cd..deb39a47cd 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
index 7f246cb76c..7f246cb76c 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 9ecff71874..9ecff71874 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index c2cd957351..c2cd957351 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties
index 2503be0b13..2503be0b13 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java
index fb4cb4207a..fb4cb4207a 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
index 6a6d80f15e..6a6d80f15e 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
index 93b4dee033..93b4dee033 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
index d412f6bd6a..d412f6bd6a 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
index feb9ce177e..feb9ce177e 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
index 630c1502d1..630c1502d1 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
index 1831587896..1831587896 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
index e1bbd97655..e1bbd97655 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
index 254ce99d59..254ce99d59 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/test/resources/osgiproptest.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/test/resources/osgiproptest.composite
index 0b31145407..0b31145407 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/test/resources/osgiproptest.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/test/resources/osgiproptest.composite
diff --git a/branches/sca-equinox/modules/implementation-osgi/src/test/resources/osgitest.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/test/resources/osgitest.composite
index 5465eec8d9..5465eec8d9 100644
--- a/branches/sca-equinox/modules/implementation-osgi/src/test/resources/osgitest.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-osgi/src/test/resources/osgitest.composite
diff --git a/branches/sca-equinox/modules/implementation-resource-runtime/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource-runtime/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/implementation-resource-runtime/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource-runtime/LICENSE
diff --git a/branches/sca-equinox/modules/implementation-resource-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource-runtime/META-INF/MANIFEST.MF
index 24f187b921..24f187b921 100644
--- a/branches/sca-equinox/modules/implementation-resource-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource-runtime/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/implementation-resource-runtime/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource-runtime/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/implementation-resource-runtime/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource-runtime/NOTICE
diff --git a/branches/sca-equinox/modules/implementation-resource-runtime/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource-runtime/pom.xml
index af39ccbc67..af39ccbc67 100644
--- a/branches/sca-equinox/modules/implementation-resource-runtime/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource-runtime/pom.xml
diff --git a/branches/sca-equinox/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java
index 582795625d..582795625d 100644
--- a/branches/sca-equinox/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java
diff --git a/branches/sca-equinox/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
index a974f68a7e..a974f68a7e 100644
--- a/branches/sca-equinox/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
diff --git a/branches/sca-equinox/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
index 47e70b5581..47e70b5581 100644
--- a/branches/sca-equinox/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
diff --git a/branches/sca-equinox/modules/implementation-resource-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 656d8c2751..656d8c2751 100644
--- a/branches/sca-equinox/modules/implementation-resource-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-equinox/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
index 9b3c959753..9b3c959753 100644
--- a/branches/sca-equinox/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-resource-runtime/src/test/resources/content/test.html b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource-runtime/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-equinox/modules/implementation-resource-runtime/src/test/resources/content/test.html
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource-runtime/src/test/resources/content/test.html
diff --git a/branches/sca-equinox/modules/implementation-resource-runtime/src/test/resources/resource.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource-runtime/src/test/resources/resource.composite
index 4654056cd7..4654056cd7 100644
--- a/branches/sca-equinox/modules/implementation-resource-runtime/src/test/resources/resource.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource-runtime/src/test/resources/resource.composite
diff --git a/branches/sca-equinox/modules/implementation-resource/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/implementation-resource/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/LICENSE
diff --git a/branches/sca-equinox/modules/implementation-resource/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/META-INF/MANIFEST.MF
index 55271ff6cc..55271ff6cc 100644
--- a/branches/sca-equinox/modules/implementation-resource/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/implementation-resource/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/implementation-resource/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/NOTICE
diff --git a/branches/sca-equinox/modules/implementation-resource/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/pom.xml
index ee507b6022..ee507b6022 100644
--- a/branches/sca-equinox/modules/implementation-resource/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/pom.xml
diff --git a/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
index 68219de701..68219de701 100644
--- a/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
diff --git a/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
index be136ee792..be136ee792 100644
--- a/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
diff --git a/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
index 95ac452c66..95ac452c66 100644
--- a/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
diff --git a/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
index 2eb7b681b6..2eb7b681b6 100644
--- a/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
diff --git a/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
index 9cad0890a3..9cad0890a3 100644
--- a/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
diff --git a/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
index 9c1453fba3..9c1453fba3 100644
--- a/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index b5774c5c5b..b5774c5c5b 100644
--- a/branches/sca-equinox/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
index f77f723c3e..f77f723c3e 100644
--- a/branches/sca-equinox/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
diff --git a/branches/sca-equinox/modules/implementation-resource/src/main/resources/impl-resource-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/src/main/resources/impl-resource-validation-messages.properties
index 7f619ef036..7f619ef036 100644
--- a/branches/sca-equinox/modules/implementation-resource/src/main/resources/impl-resource-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-resource/src/main/resources/impl-resource-validation-messages.properties
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/LICENSE
index 4b5ab74408..4b5ab74408 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/LICENSE
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/META-INF/MANIFEST.MF
index e08aeb7a56..e08aeb7a56 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/NOTICE
index 5782e5ee9b..5782e5ee9b 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/NOTICE
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/pom.xml
index 47adfa24a0..47adfa24a0 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/pom.xml
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
index 324246c32b..324246c32b 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProvider.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProvider.java
index 473b990a79..473b990a79 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProvider.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProviderFactory.java
index f65403c9ed..f65403c9ed 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProviderFactory.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptInvoker.java
index 976eb2c0dd..976eb2c0dd 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptInvoker.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptPropertyFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptPropertyFactory.java
index 5833c9f4d5..5833c9f4d5 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptPropertyFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptPropertyFactory.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 941cfd7fd5..941cfd7fd5 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
index f098885741..f098885741 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
index 1af3a295a4..1af3a295a4 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
index 6a4f10dbbb..6a4f10dbbb 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
index f87cf104f3..f87cf104f3 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
index 980864869f..980864869f 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
index ca4bd5ae6a..ca4bd5ae6a 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
index 46ed9abce6..46ed9abce6 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
index d694515829..d694515829 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
index e7375253a3..e7375253a3 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
index f93edc76d1..f93edc76d1 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
index 910d22ec83..910d22ec83 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
index 47cdc03e0e..47cdc03e0e 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
index 60c73359c0..60c73359c0 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
index cde96b4b9b..cde96b4b9b 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
index 0e6be74e09..0e6be74e09 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
index 6116581356..6116581356 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
index dfcd37c46c..dfcd37c46c 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
index 83c2e99469..83c2e99469 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
index 392e16411c..392e16411c 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
index 8866ae6b70..8866ae6b70 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
index ce377e4ed3..ce377e4ed3 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
index 4d32ed9f6b..4d32ed9f6b 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
index 13cb94d511..13cb94d511 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
index c641b82cd6..c641b82cd6 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
index bb0ddd002f..bb0ddd002f 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
index 9f89bd373e..9f89bd373e 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
index eac2ab283f..eac2ab283f 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
index f5dd0f8fcf..f5dd0f8fcf 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
index cd2d3bcaea..cd2d3bcaea 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
index 26574c6266..26574c6266 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
index a3551cefc3..a3551cefc3 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
index f72c6e922f..f72c6e922f 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
index bd754c8d2e..bd754c8d2e 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
index 06f261015e..06f261015e 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
index a7eb446d37..a7eb446d37 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
index 64df3ebbef..64df3ebbef 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
index 868cfa9eeb..868cfa9eeb 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
index 2844f8b8d9..2844f8b8d9 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
index 175bb79104..175bb79104 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
index 7581b633cc..7581b633cc 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
index 91085b9eb2..91085b9eb2 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
index 535164aae7..535164aae7 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
index 3edd075126..3edd075126 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
index 5d2216d583..5d2216d583 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
index ad0a932d26..ad0a932d26 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
index aee8bf991d..aee8bf991d 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
diff --git a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
index 87f0f56082..87f0f56082 100644
--- a/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
diff --git a/branches/sca-equinox/modules/implementation-script/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/implementation-script/LICENSE
index 4b5ab74408..4b5ab74408 100644
--- a/branches/sca-equinox/modules/implementation-script/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script/LICENSE
diff --git a/branches/sca-equinox/modules/implementation-script/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/implementation-script/META-INF/MANIFEST.MF
index 7d3b34d5f3..7d3b34d5f3 100644
--- a/branches/sca-equinox/modules/implementation-script/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/implementation-script/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/implementation-script/NOTICE
index 5782e5ee9b..5782e5ee9b 100644
--- a/branches/sca-equinox/modules/implementation-script/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script/NOTICE
diff --git a/branches/sca-equinox/modules/implementation-script/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-script/pom.xml
index 76fc533701..76fc533701 100644
--- a/branches/sca-equinox/modules/implementation-script/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script/pom.xml
diff --git a/branches/sca-equinox/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
index 9dc8f2aeca..9dc8f2aeca 100644
--- a/branches/sca-equinox/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
diff --git a/branches/sca-equinox/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProcessor.java
index 1aec9d0df3..1aec9d0df3 100644
--- a/branches/sca-equinox/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 794fe423b0..794fe423b0 100644
--- a/branches/sca-equinox/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/LICENSE
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/META-INF/MANIFEST.MF
index 956a4f248d..956a4f248d 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/NOTICE
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/pom.xml
index dc04464cee..dc04464cee 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/pom.xml
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java
index 6ed1840b6b..6ed1840b6b 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java
index 4e1c861910..4e1c861910 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java
index d654d1172a..d654d1172a 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java
index 5f7614a68e..5f7614a68e 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.java
index a025d23b9f..a025d23b9f 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java
index 178f538339..178f538339 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java
index ae5093dbea..ae5093dbea 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java
index f780c71549..f780c71549 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java
index eb83a92f6a..eb83a92f6a 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java
index a195549851..a195549851 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java
index b63518d1c7..b63518d1c7 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 6edfc3b6ca..6edfc3b6ca 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
index d782384ce6..d782384ce6 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
index c9b30b1688..c9b30b1688 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
index fd295daaf6..fd295daaf6 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
index 65ab096855..65ab096855 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
index bd35e9f3b9..bd35e9f3b9 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java
index d77f183a66..d77f183a66 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
index 86f979fe15..86f979fe15 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
index 44016ad249..44016ad249 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
index 74dcf32723..74dcf32723 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
index 97f91ff91e..97f91ff91e 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java
index bfe3d64cf3..bfe3d64cf3 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
index 2c46f8c066..2c46f8c066 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
index 4d60bffef8..4d60bffef8 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
index acad9f2fea..acad9f2fea 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java
index 79de2b32a0..79de2b32a0 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
index f165bb8b75..f165bb8b75 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
index a1d9b5a2f4..a1d9b5a2f4 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
index ab4c07d059..ab4c07d059 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
index 0f00c7e480..0f00c7e480 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringContextAccess-context.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringContextAccess-context.xml
index a7d30bf201..a7d30bf201 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringContextAccess-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringContextAccess-context.xml
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
index 7c358ac01c..7c358ac01c 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
index 38e90b41fa..38e90b41fa 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml
index 18ce21805c..18ce21805c 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
index 18ce21805c..18ce21805c 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
index e6b69e8cad..e6b69e8cad 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml
index 8e18a56cca..8e18a56cca 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testReferenceContext.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testReferenceContext.xml
index fdbbeeced2..fdbbeeced2 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testReferenceContext.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testReferenceContext.xml
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testServiceContext.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testServiceContext.xml
index 6b3f1f9890..6b3f1f9890 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testServiceContext.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testServiceContext.xml
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/SpringHelloWorld-Imported-context.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/SpringHelloWorld-Imported-context.xml
index 18ce21805c..18ce21805c 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/SpringHelloWorld-Imported-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/SpringHelloWorld-Imported-context.xml
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite
index 0b260b5dcf..0b260b5dcf 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
index 79f4041fe6..79f4041fe6 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
index 87353b69ea..87353b69ea 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
index ebb693d243..ebb693d243 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
index 9f51277d22..9f51277d22 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite
index 95dd9131eb..95dd9131eb 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
index af1b3be0a5..af1b3be0a5 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/MANIFEST.MF
index 950dbeba4c..950dbeba4c 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml
index f1ee21686d..f1ee21686d 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml
diff --git a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/test.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/test.xml
index f2d684f766..f2d684f766 100644
--- a/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/test.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring-runtime/src/test/resources/test.xml
diff --git a/branches/sca-equinox/modules/implementation-spring/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/implementation-spring/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/LICENSE
diff --git a/branches/sca-equinox/modules/implementation-spring/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/META-INF/MANIFEST.MF
index f35441326e..f35441326e 100644
--- a/branches/sca-equinox/modules/implementation-spring/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/implementation-spring/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/implementation-spring/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/NOTICE
diff --git a/branches/sca-equinox/modules/implementation-spring/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/pom.xml
index 4455412f3c..4455412f3c 100644
--- a/branches/sca-equinox/modules/implementation-spring/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/pom.xml
diff --git a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
index 35df76fabc..35df76fabc 100644
--- a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
diff --git a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
index 8f49a1751b..8f49a1751b 100644
--- a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
diff --git a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
index cd2f381937..cd2f381937 100644
--- a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java
index 92f980fdfe..92f980fdfe 100644
--- a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java
diff --git a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
index f9a9fee58f..f9a9fee58f 100644
--- a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
diff --git a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
index f142b429b3..f142b429b3 100644
--- a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
diff --git a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java
index 57f4a26ba3..57f4a26ba3 100644
--- a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java
diff --git a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
index 39e1286f32..39e1286f32 100644
--- a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
diff --git a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
index 2f37ab6504..2f37ab6504 100644
--- a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
diff --git a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
index b3f45415fd..b3f45415fd 100644
--- a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
diff --git a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
index 2eb5686270..2eb5686270 100644
--- a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
diff --git a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
index 41d529a3d9..41d529a3d9 100644
--- a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
diff --git a/branches/sca-equinox/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 4b71cef6c4..4b71cef6c4 100644
--- a/branches/sca-equinox/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/implementation-spring/src/main/resources/META-INF/spring.handlers b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
index 7f9a7b17b0..7f9a7b17b0 100644
--- a/branches/sca-equinox/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
diff --git a/branches/sca-equinox/modules/implementation-spring/src/main/resources/META-INF/spring.schemas b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
index 249cc21c13..249cc21c13 100644
--- a/branches/sca-equinox/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
diff --git a/branches/sca-equinox/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
index 6fce02664a..6fce02664a 100644
--- a/branches/sca-equinox/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
diff --git a/branches/sca-equinox/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
index e20f4e8158..e20f4e8158 100644
--- a/branches/sca-equinox/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/LICENSE
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/META-INF/MANIFEST.MF
index 3e296842bd..3e296842bd 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/NOTICE
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml
index c71bcec5cd..c71bcec5cd 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
index 49f7a4e120..49f7a4e120 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
index 61176d912c..61176d912c 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
index c57680fa1c..c57680fa1c 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java
index ecf7f946e8..ecf7f946e8 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index d0f73cbdbb..d0f73cbdbb 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/src/main/resources/binding-atom.js b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/main/resources/binding-atom.js
index 2719e9a9b9..2719e9a9b9 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/src/main/resources/binding-atom.js
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/main/resources/binding-atom.js
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/src/main/resources/binding-http.js b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/main/resources/binding-http.js
index 60bd841679..60bd841679 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/src/main/resources/binding-http.js
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/main/resources/binding-http.js
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/src/main/resources/binding-jsonrpc.js b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/main/resources/binding-jsonrpc.js
index ca3c2a8605..ca3c2a8605 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/src/main/resources/binding-jsonrpc.js
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/main/resources/binding-jsonrpc.js
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
index 3d559c20d5..3d559c20d5 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/src/test/java/store/Catalog.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/test/java/store/Catalog.java
index 370474f29f..370474f29f 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/src/test/java/store/Catalog.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/test/java/store/Catalog.java
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java
index bed053eeee..bed053eeee 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/src/test/java/store/ShoppingCartImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/test/java/store/ShoppingCartImpl.java
index 37e8d0161a..37e8d0161a 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/src/test/java/store/ShoppingCartImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/test/java/store/ShoppingCartImpl.java
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/src/test/resources/content/atomModel.js b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/test/resources/content/atomModel.js
index fa0396a4d8..fa0396a4d8 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/src/test/resources/content/atomModel.js
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/test/resources/content/atomModel.js
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/src/test/resources/content/store.html b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/test/resources/content/store.html
index 58f9f560a7..58f9f560a7 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/src/test/resources/content/store.html
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/test/resources/content/store.html
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html
index e58f14a635..e58f14a635 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/src/test/resources/widget.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/test/resources/widget.composite
index f23d6a20f5..f23d6a20f5 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/src/test/resources/widget.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/test/resources/widget.composite
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/src/test/resources/widgetJS.composite b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/test/resources/widgetJS.composite
index e44a56e520..e44a56e520 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/src/test/resources/widgetJS.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget-runtime/src/test/resources/widgetJS.composite
diff --git a/branches/sca-equinox/modules/implementation-widget/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/implementation-widget/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/LICENSE
diff --git a/branches/sca-equinox/modules/implementation-widget/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/META-INF/MANIFEST.MF
index 18a2f3ce3b..18a2f3ce3b 100644
--- a/branches/sca-equinox/modules/implementation-widget/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/implementation-widget/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/implementation-widget/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/NOTICE
diff --git a/branches/sca-equinox/modules/implementation-widget/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/pom.xml
index b4f00380e8..b4f00380e8 100644
--- a/branches/sca-equinox/modules/implementation-widget/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/pom.xml
diff --git a/branches/sca-equinox/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
index f47850a05c..f47850a05c 100644
--- a/branches/sca-equinox/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
diff --git a/branches/sca-equinox/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
index b35cc41dd4..b35cc41dd4 100644
--- a/branches/sca-equinox/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
diff --git a/branches/sca-equinox/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
index dc5759a13d..dc5759a13d 100644
--- a/branches/sca-equinox/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
diff --git a/branches/sca-equinox/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
index abe00bac5b..abe00bac5b 100644
--- a/branches/sca-equinox/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
diff --git a/branches/sca-equinox/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
index 1d3e71dfcb..1d3e71dfcb 100644
--- a/branches/sca-equinox/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 6c167a6b31..6c167a6b31 100644
--- a/branches/sca-equinox/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
index fc45baa16d..fc45baa16d 100644
--- a/branches/sca-equinox/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
diff --git a/branches/sca-equinox/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties
index 3778bd4c50..3778bd4c50 100644
--- a/branches/sca-equinox/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties
diff --git a/branches/sca-equinox/modules/implementation-xquery/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/LICENSE
index d645695673..d645695673 100644
--- a/branches/sca-equinox/modules/implementation-xquery/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/LICENSE
diff --git a/branches/sca-equinox/modules/implementation-xquery/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/META-INF/MANIFEST.MF
index a8d970b4ae..a8d970b4ae 100644
--- a/branches/sca-equinox/modules/implementation-xquery/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/implementation-xquery/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/implementation-xquery/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/NOTICE
diff --git a/branches/sca-equinox/modules/implementation-xquery/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/pom.xml
index 433b3e710f..433b3e710f 100644
--- a/branches/sca-equinox/modules/implementation-xquery/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/pom.xml
diff --git a/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java
index f5bc5dd9b8..f5bc5dd9b8 100644
--- a/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java
diff --git a/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java
index bdfd390499..bdfd390499 100644
--- a/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java
diff --git a/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
index 63a3a49e13..63a3a49e13 100644
--- a/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
diff --git a/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java
index 57536e502b..57536e502b 100644
--- a/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java
diff --git a/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java
index 0c628b3715..0c628b3715 100644
--- a/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java
diff --git a/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
index 2a9673068b..2a9673068b 100644
--- a/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
diff --git a/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
index 5e77575c3c..5e77575c3c 100644
--- a/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
diff --git a/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java
index 77c8eea511..77c8eea511 100644
--- a/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java
diff --git a/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java
index c8d19bf149..c8d19bf149 100644
--- a/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java
diff --git a/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
index 59ac68aa7d..59ac68aa7d 100644
--- a/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
diff --git a/branches/sca-equinox/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index a51995e56d..a51995e56d 100644
--- a/branches/sca-equinox/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 7ccc08d1ee..7ccc08d1ee 100644
--- a/branches/sca-equinox/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-equinox/modules/implementation-xquery/src/main/resources/impl-xquery-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/resources/impl-xquery-validation-messages.properties
index 33c605de27..33c605de27 100644
--- a/branches/sca-equinox/modules/implementation-xquery/src/main/resources/impl-xquery-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/implementation-xquery/src/main/resources/impl-xquery-validation-messages.properties
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/LICENSE
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/META-INF/MANIFEST.MF
index 6378fdb1ee..6378fdb1ee 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/NOTICE
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/pom.xml
index 00d8f33ba8..00d8f33ba8 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/pom.xml
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java
index 4cf56fed0c..4cf56fed0c 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java
index b05715b54e..b05715b54e 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java
index 40fbefa3ed..40fbefa3ed 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java
index f36dd3a443..f36dd3a443 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java
index c3f568ef48..c3f568ef48 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
index 75a0aa8131..75a0aa8131 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
index d1b36fa17c..d1b36fa17c 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java
index 764c10ff00..764c10ff00 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
index 1b07e25bad..1b07e25bad 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
index d38a21ba52..d38a21ba52 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
index 7b9375063d..7b9375063d 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java
index 567591f166..567591f166 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
index 108d283584..108d283584 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java
index b3c7102a78..b3c7102a78 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java
index 4df0517de6..4df0517de6 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
index 78527193d5..78527193d5 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java
index 2ecf822904..2ecf822904 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java
index a6a3375eff..a6a3375eff 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java
index b14ef19939..b14ef19939 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl
index 882408ade6..882408ade6 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
index 4fee9e9756..4fee9e9756 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
diff --git a/branches/sca-equinox/modules/interface-java-xml/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/interface-java-xml/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/LICENSE
diff --git a/branches/sca-equinox/modules/interface-java-xml/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/META-INF/MANIFEST.MF
index 806a7730dc..806a7730dc 100644
--- a/branches/sca-equinox/modules/interface-java-xml/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/interface-java-xml/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/interface-java-xml/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/NOTICE
diff --git a/branches/sca-equinox/modules/interface-java-xml/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/pom.xml
index 9ec396b264..9ec396b264 100644
--- a/branches/sca-equinox/modules/interface-java-xml/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/pom.xml
diff --git a/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
index 2b45eac7bc..2b45eac7bc 100644
--- a/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
diff --git a/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
index ed9b435e36..ed9b435e36 100644
--- a/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
diff --git a/branches/sca-equinox/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index b3e52e5709..b3e52e5709 100644
--- a/branches/sca-equinox/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/interface-java-xml/src/main/resources/interface-javaxml-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/src/main/resources/interface-javaxml-validation-messages.properties
index bc0a7192b5..bc0a7192b5 100644
--- a/branches/sca-equinox/modules/interface-java-xml/src/main/resources/interface-javaxml-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/src/main/resources/interface-javaxml-validation-messages.properties
diff --git a/branches/sca-equinox/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
index 9891d79676..9891d79676 100644
--- a/branches/sca-equinox/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
diff --git a/branches/sca-equinox/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
index b21505936b..b21505936b 100644
--- a/branches/sca-equinox/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
diff --git a/branches/sca-equinox/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
index 3de6410596..3de6410596 100644
--- a/branches/sca-equinox/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
diff --git a/branches/sca-equinox/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
index dca38c9224..dca38c9224 100644
--- a/branches/sca-equinox/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-equinox/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
index 23ebf576e5..23ebf576e5 100644
--- a/branches/sca-equinox/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
diff --git a/branches/sca-equinox/modules/interface-java/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/interface-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/interface-java/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/LICENSE
diff --git a/branches/sca-equinox/modules/interface-java/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/interface-java/META-INF/MANIFEST.MF
index a2f58302b3..a2f58302b3 100644
--- a/branches/sca-equinox/modules/interface-java/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/interface-java/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/interface-java/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/interface-java/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/NOTICE
diff --git a/branches/sca-equinox/modules/interface-java/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/interface-java/pom.xml
index 6f4f479d1d..6f4f479d1d 100644
--- a/branches/sca-equinox/modules/interface-java/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/pom.xml
diff --git a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
index 67a9c8f2c6..67a9c8f2c6 100644
--- a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
diff --git a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
index 9c09ef50c2..9c09ef50c2 100644
--- a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
diff --git a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
index e3a84c63f0..e3a84c63f0 100644
--- a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
diff --git a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
index 9225926269..9225926269 100644
--- a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
diff --git a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
index e6cb35cc4b..e6cb35cc4b 100644
--- a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
diff --git a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
index d43ebe558b..d43ebe558b 100644
--- a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
diff --git a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
index b1efd6e197..b1efd6e197 100644
--- a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
diff --git a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
index 42e45317b7..42e45317b7 100644
--- a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
diff --git a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
index b1198824fa..b1198824fa 100644
--- a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
diff --git a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
index 2a9e3c5329..2a9e3c5329 100644
--- a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
diff --git a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
index 4384213bf5..4384213bf5 100644
--- a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
diff --git a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
index ed00510a67..ed00510a67 100644
--- a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
diff --git a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
index 3bc03a528e..3bc03a528e 100644
--- a/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
diff --git a/branches/sca-equinox/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
index 5ba12ec137..5ba12ec137 100644
--- a/branches/sca-equinox/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
diff --git a/branches/sca-equinox/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java
index 14b0577f65..14b0577f65 100644
--- a/branches/sca-equinox/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java
diff --git a/branches/sca-equinox/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
index 66f98adce3..66f98adce3 100644
--- a/branches/sca-equinox/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
diff --git a/branches/sca-equinox/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
index f90a5cb8a1..f90a5cb8a1 100644
--- a/branches/sca-equinox/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
diff --git a/branches/sca-equinox/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java.fixme b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java.fixme
index 14ac8b0134..14ac8b0134 100644
--- a/branches/sca-equinox/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java.fixme
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java.fixme
diff --git a/branches/sca-equinox/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
index 5a454f176c..5a454f176c 100644
--- a/branches/sca-equinox/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/LICENSE
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/META-INF/MANIFEST.MF
index e4e7ad08cb..e4e7ad08cb 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/NOTICE
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/pom.xml
index c9034beb2f..c9034beb2f 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/pom.xml
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java
index 5178149b63..5178149b63 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
index 82d18ca319..82d18ca319 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
index 8331215067..8331215067 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
index d40aac9434..d40aac9434 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
index 5fd26ca953..5fd26ca953 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 9666a6dbd8..9666a6dbd8 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 553c764233..553c764233 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 30d2039e80..30d2039e80 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/resources/interface-wsdlxml-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/main/resources/interface-wsdlxml-validation-messages.properties
index 2f8c3e0500..2f8c3e0500 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/resources/interface-wsdlxml-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/main/resources/interface-wsdlxml-validation-messages.properties
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java
index 5cafcccea1..5cafcccea1 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
index 7f17f7463f..7f17f7463f 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
index 6574bbd7c4..6574bbd7c4 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
index ca7d96ccb0..ca7d96ccb0 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
index 6448291f41..6448291f41 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
index eb276a1908..eb276a1908 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
index 875fdf35d2..875fdf35d2 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
index 3eb81b61bd..3eb81b61bd 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
index aea7046a3d..aea7046a3d 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
index 5e8e5dad0d..5e8e5dad0d 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
index ad81fc7867..ad81fc7867 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
index 39cd5547d9..39cd5547d9 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
index 8e26f7b4b5..8e26f7b4b5 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
index c2210f4a94..c2210f4a94 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
index 529b395fd5..529b395fd5 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
index 666a7e4069..666a7e4069 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl
index 7cdf801692..7cdf801692 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl
index b0b6644e7f..b0b6644e7f 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl
index 0a7979e308..0a7979e308 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd
index 635ca25bfc..635ca25bfc 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd
index bb0c9bc7b7..bb0c9bc7b7 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd
diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd
index 300de931ec..300de931ec 100644
--- a/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd
diff --git a/branches/sca-equinox/modules/interface-wsdl/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/interface-wsdl/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/LICENSE
diff --git a/branches/sca-equinox/modules/interface-wsdl/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/META-INF/MANIFEST.MF
index 0719e71d94..0719e71d94 100644
--- a/branches/sca-equinox/modules/interface-wsdl/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/interface-wsdl/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/interface-wsdl/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/NOTICE
diff --git a/branches/sca-equinox/modules/interface-wsdl/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/pom.xml
index 47a2203743..47a2203743 100644
--- a/branches/sca-equinox/modules/interface-wsdl/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/pom.xml
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/BPELPartnerLinkTypeExt.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/BPELPartnerLinkTypeExt.java
index 0d6f23e732..0d6f23e732 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/BPELPartnerLinkTypeExt.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/BPELPartnerLinkTypeExt.java
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
index 8d571a4404..8d571a4404 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
index 039e75f437..039e75f437 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
index 95985dcc28..95985dcc28 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
index c0da060af2..c0da060af2 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
index 59db17116b..59db17116b 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
index 0b707163da..0b707163da 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java
index d73cccb714..d73cccb714 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
index 1e7b4faa32..1e7b4faa32 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
index 82a7aa1200..82a7aa1200 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
index 883b6b1567..883b6b1567 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
index e10bc0d178..e10bc0d178 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
index 3719bbd79a..3719bbd79a 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
index 377f7b307d..377f7b307d 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java
index f18eaef27b..f18eaef27b 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java
index 317b9cce81..317b9cce81 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
index ab6467bfd7..ab6467bfd7 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
index c11d22d7b2..c11d22d7b2 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
index 8ed7ba395b..8ed7ba395b 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
index dc7e1ced38..dc7e1ced38 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
index c392b92f8a..c392b92f8a 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
index cf379a1b11..cf379a1b11 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
diff --git a/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
index ff18c65c69..ff18c65c69 100644
--- a/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
diff --git a/branches/sca-equinox/modules/interface/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/interface/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/interface/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/LICENSE
diff --git a/branches/sca-equinox/modules/interface/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/interface/META-INF/MANIFEST.MF
index 50d1eb711a..50d1eb711a 100644
--- a/branches/sca-equinox/modules/interface/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/interface/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/interface/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/interface/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/NOTICE
diff --git a/branches/sca-equinox/modules/interface/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/interface/pom.xml
index d11f006073..d11f006073 100644
--- a/branches/sca-equinox/modules/interface/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/pom.xml
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
index 247a432330..247a432330 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
index 1f5620c0b9..1f5620c0b9 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
index 70f6d5b403..70f6d5b403 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
index 179dc1755e..179dc1755e 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
index f9de645a6e..f9de645a6e 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
index 568a6c595c..568a6c595c 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
index 5601b09660..5601b09660 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
index f952a86478..f952a86478 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
index 2a273c9a26..2a273c9a26 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
index b19805c5b1..b19805c5b1 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
index 4676e35f80..4676e35f80 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
index 6773b29088..6773b29088 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
index c1c8400b71..c1c8400b71 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
index 15581b5e04..15581b5e04 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
index 9e7d6882f7..9e7d6882f7 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
index e2a524c5e0..e2a524c5e0 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
index 00a5dc3065..00a5dc3065 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
index 777fa567f1..777fa567f1 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
index 844b0af509..844b0af509 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
index 54c0a3ec11..54c0a3ec11 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
index 2598dc8545..2598dc8545 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
index 12db460959..12db460959 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
diff --git a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
index 26ecf6e352..26ecf6e352 100644
--- a/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
diff --git a/branches/sca-equinox/modules/interface/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
index 821c58bde1..821c58bde1 100644
--- a/branches/sca-equinox/modules/interface/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
diff --git a/branches/sca-equinox/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
index 269a3dc038..269a3dc038 100644
--- a/branches/sca-equinox/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
diff --git a/branches/sca-equinox/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
index 338170da52..338170da52 100644
--- a/branches/sca-equinox/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
diff --git a/branches/sca-equinox/modules/monitor/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/monitor/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/monitor/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/monitor/LICENSE
diff --git a/branches/sca-equinox/modules/monitor/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/monitor/META-INF/MANIFEST.MF
index 131bbcaf52..131bbcaf52 100644
--- a/branches/sca-equinox/modules/monitor/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/monitor/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/monitor/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/monitor/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/monitor/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/monitor/NOTICE
diff --git a/branches/sca-equinox/modules/monitor/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/monitor/pom.xml
index 8b5b57d869..8b5b57d869 100644
--- a/branches/sca-equinox/modules/monitor/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/monitor/pom.xml
diff --git a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java b/sca-java-2.x/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java
index b38968caeb..b38968caeb 100644
--- a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java
diff --git a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java b/sca-java-2.x/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
index f0ac8a6dbb..f0ac8a6dbb 100644
--- a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
diff --git a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java b/sca-java-2.x/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java
index 3384626958..3384626958 100644
--- a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java
diff --git a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java b/sca-java-2.x/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java
index 83a2d63eae..83a2d63eae 100644
--- a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java
diff --git a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java b/sca-java-2.x/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java
index fa562a5f23..fa562a5f23 100644
--- a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java
diff --git a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java b/sca-java-2.x/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java
index 5a0aaeddd0..5a0aaeddd0 100644
--- a/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java
diff --git a/branches/sca-equinox/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory b/sca-java-2.x/branches/sca-equinox/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
index ae81aef136..ae81aef136 100644
--- a/branches/sca-equinox/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
diff --git a/branches/sca-equinox/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java
index 4380e32f99..4380e32f99 100644
--- a/branches/sca-equinox/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java
diff --git a/branches/sca-equinox/modules/monitor/src/test/resources/tuscany-monitor-test-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/monitor/src/test/resources/tuscany-monitor-test-messages.properties
index 523263da40..523263da40 100644
--- a/branches/sca-equinox/modules/monitor/src/test/resources/tuscany-monitor-test-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/monitor/src/test/resources/tuscany-monitor-test-messages.properties
diff --git a/branches/sca-equinox/modules/monitor/src/test/resources/tuscany-monitor-test-messages_it.properties b/sca-java-2.x/branches/sca-equinox/modules/monitor/src/test/resources/tuscany-monitor-test-messages_it.properties
index 523263da40..523263da40 100644
--- a/branches/sca-equinox/modules/monitor/src/test/resources/tuscany-monitor-test-messages_it.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/monitor/src/test/resources/tuscany-monitor-test-messages_it.properties
diff --git a/branches/sca-equinox/modules/node-api/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/node-api/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/node-api/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-api/LICENSE
diff --git a/branches/sca-equinox/modules/node-api/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/node-api/META-INF/MANIFEST.MF
index 077bca13a3..077bca13a3 100644
--- a/branches/sca-equinox/modules/node-api/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-api/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/node-api/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/node-api/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/node-api/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-api/NOTICE
diff --git a/branches/sca-equinox/modules/node-api/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/node-api/pom.xml
index 3f51362bb5..3f51362bb5 100644
--- a/branches/sca-equinox/modules/node-api/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-api/pom.xml
diff --git a/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Client.java b/sca-java-2.x/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Client.java
index 8ca5262eff..8ca5262eff 100644
--- a/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Client.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Client.java
diff --git a/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Contribution.java b/sca-java-2.x/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Contribution.java
index f69e18dc63..f69e18dc63 100644
--- a/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Contribution.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Contribution.java
diff --git a/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/ContributionLocationHelper.java b/sca-java-2.x/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/ContributionLocationHelper.java
index 96a25dfa63..96a25dfa63 100644
--- a/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/ContributionLocationHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/ContributionLocationHelper.java
diff --git a/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java b/sca-java-2.x/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java
index 3f4998bcc9..3f4998bcc9 100644
--- a/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java
diff --git a/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java b/sca-java-2.x/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
index a9f75fc8be..a9f75fc8be 100644
--- a/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
diff --git a/branches/sca-equinox/modules/node-impl/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/node-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/node-impl/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-impl/LICENSE
diff --git a/branches/sca-equinox/modules/node-impl/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/node-impl/META-INF/MANIFEST.MF
index 0391a04003..0391a04003 100644
--- a/branches/sca-equinox/modules/node-impl/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-impl/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/node-impl/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/node-impl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/node-impl/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-impl/NOTICE
diff --git a/branches/sca-equinox/modules/node-impl/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/node-impl/pom.xml
index ce8040b016..ce8040b016 100644
--- a/branches/sca-equinox/modules/node-impl/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-impl/pom.xml
diff --git a/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
index 62758e8332..62758e8332 100644
--- a/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
diff --git a/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/sca-java-2.x/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
index effccd0f4d..effccd0f4d 100644
--- a/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
diff --git a/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java b/sca-java-2.x/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java
index 396d77af66..396d77af66 100644
--- a/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java
diff --git a/branches/sca-equinox/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory b/sca-java-2.x/branches/sca-equinox/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory
index 800bdd84cc..800bdd84cc 100644
--- a/branches/sca-equinox/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory
diff --git a/branches/sca-equinox/modules/node-impl/src/test/java/hello/HelloWorld.java b/sca-java-2.x/branches/sca-equinox/modules/node-impl/src/test/java/hello/HelloWorld.java
index 2f519cb81d..2f519cb81d 100644
--- a/branches/sca-equinox/modules/node-impl/src/test/java/hello/HelloWorld.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-impl/src/test/java/hello/HelloWorld.java
diff --git a/branches/sca-equinox/modules/node-impl/src/test/java/hello/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
index c9a7560b12..c9a7560b12 100644
--- a/branches/sca-equinox/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
diff --git a/branches/sca-equinox/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
index bd760d613d..bd760d613d 100644
--- a/branches/sca-equinox/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
diff --git a/branches/sca-equinox/modules/node-impl/src/test/resources/HelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/node-impl/src/test/resources/HelloWorld.composite
index 9e3299d691..9e3299d691 100644
--- a/branches/sca-equinox/modules/node-impl/src/test/resources/HelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-impl/src/test/resources/HelloWorld.composite
diff --git a/branches/sca-equinox/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
index 1d37bcebe0..1d37bcebe0 100644
--- a/branches/sca-equinox/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/LICENSE
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/META-INF/MANIFEST.MF
index 37d3c72d1b..37d3c72d1b 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/NOTICE
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/pom.xml
index 2f583ece35..2f583ece35 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/pom.xml
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java
index 892412b395..892412b395 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/ContributionLocationHelper.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/ContributionLocationHelper.java
index fd7aaed4c8..fd7aaed4c8 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/ContributionLocationHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/ContributionLocationHelper.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java
index 61187eecac..61187eecac 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
index 6007c0dac2..6007c0dac2 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java
index b9bb70b5d7..b9bb70b5d7 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java
index b77382d6a0..b77382d6a0 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
index 68d1fa05e7..68d1fa05e7 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
index 93f1b01206..93f1b01206 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java
index 17172dbd5e..17172dbd5e 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/J2SE-1.5.profile b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/J2SE-1.5.profile
index 3814b42d00..3814b42d00 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/J2SE-1.5.profile
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/J2SE-1.5.profile
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/JavaSE-1.6.profile b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/JavaSE-1.6.profile
index 816e7c44f4..816e7c44f4 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/JavaSE-1.6.profile
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/JavaSE-1.6.profile
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java
index 2f519cb81d..2f519cb81d 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
index 11e008619c..11e008619c 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
index e51d3c79d9..e51d3c79d9 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
index cd3f1e294e..cd3f1e294e 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
index 6186b1799a..6186b1799a 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
index 0608e70ca5..0608e70ca5 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
diff --git a/branches/sca-equinox/modules/node-launcher-webapp/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/node-launcher-webapp/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/LICENSE
diff --git a/branches/sca-equinox/modules/node-launcher-webapp/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/node-launcher-webapp/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/NOTICE
diff --git a/branches/sca-equinox/modules/node-launcher-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/pom.xml
index 0522800e1e..0522800e1e 100644
--- a/branches/sca-equinox/modules/node-launcher-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/pom.xml
diff --git a/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 78bbebbb83..78bbebbb83 100644
--- a/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml
index 6c2c943c99..6c2c943c99 100644
--- a/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/index.jsp b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/index.jsp
index 3cc6c7b504..3cc6c7b504 100644
--- a/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/index.jsp
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/index.jsp
diff --git a/branches/sca-equinox/modules/node-launcher/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/node-launcher/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/LICENSE
diff --git a/branches/sca-equinox/modules/node-launcher/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/META-INF/MANIFEST.MF
index 6827dde638..6827dde638 100644
--- a/branches/sca-equinox/modules/node-launcher/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/node-launcher/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/node-launcher/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/NOTICE
diff --git a/branches/sca-equinox/modules/node-launcher/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/pom.xml
index 1679218bf0..1679218bf0 100644
--- a/branches/sca-equinox/modules/node-launcher/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/pom.xml
diff --git a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
index 4f4f861e2f..4f4f861e2f 100644
--- a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
diff --git a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
index eb06ad7411..eb06ad7411 100644
--- a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
diff --git a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
index 39e8d81139..39e8d81139 100644
--- a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
diff --git a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
index 7cfabfe265..7cfabfe265 100644
--- a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
diff --git a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
index be9bdb15c4..be9bdb15c4 100644
--- a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
diff --git a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
index 10d3e14838..10d3e14838 100644
--- a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
diff --git a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
index eafe4ddaa0..eafe4ddaa0 100644
--- a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
diff --git a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
index 5345363031..5345363031 100644
--- a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
diff --git a/branches/sca-equinox/modules/node-manager/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/node-manager/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/node-manager/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-manager/LICENSE
diff --git a/branches/sca-equinox/modules/node-manager/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/node-manager/META-INF/MANIFEST.MF
index 4bd395d6f6..4bd395d6f6 100644
--- a/branches/sca-equinox/modules/node-manager/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-manager/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/node-manager/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/node-manager/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-equinox/modules/node-manager/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-manager/NOTICE
diff --git a/branches/sca-equinox/modules/node-manager/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/node-manager/pom.xml
index d942932188..d942932188 100644
--- a/branches/sca-equinox/modules/node-manager/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-manager/pom.xml
diff --git a/branches/sca-equinox/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeManagerUtil.java b/sca-java-2.x/branches/sca-equinox/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeManagerUtil.java
index 8dfae91314..8dfae91314 100644
--- a/branches/sca-equinox/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeManagerUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeManagerUtil.java
diff --git a/branches/sca-equinox/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java b/sca-java-2.x/branches/sca-equinox/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java
index 019c2562ec..019c2562ec 100644
--- a/branches/sca-equinox/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java
diff --git a/branches/sca-equinox/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java
index d0475e1dd3..d0475e1dd3 100644
--- a/branches/sca-equinox/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java
diff --git a/branches/sca-equinox/modules/node-manager/src/main/resources/NodeDaemon.composite b/sca-java-2.x/branches/sca-equinox/modules/node-manager/src/main/resources/NodeDaemon.composite
index cb587b02fd..cb587b02fd 100644
--- a/branches/sca-equinox/modules/node-manager/src/main/resources/NodeDaemon.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-manager/src/main/resources/NodeDaemon.composite
diff --git a/branches/sca-equinox/modules/policy-logging/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/policy-logging/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/LICENSE
diff --git a/branches/sca-equinox/modules/policy-logging/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/META-INF/MANIFEST.MF
index 0bead60d14..0bead60d14 100644
--- a/branches/sca-equinox/modules/policy-logging/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/policy-logging/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/policy-logging/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/NOTICE
diff --git a/branches/sca-equinox/modules/policy-logging/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/pom.xml
index fbc854056c..fbc854056c 100644
--- a/branches/sca-equinox/modules/policy-logging/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/pom.xml
diff --git a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
index 836631541d..836631541d 100644
--- a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
diff --git a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
index c53c37ccf6..c53c37ccf6 100644
--- a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
diff --git a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
index b9ae619d11..b9ae619d11 100644
--- a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
diff --git a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
index 9a21f1e559..9a21f1e559 100644
--- a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
diff --git a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
index 5fd7a37a26..5fd7a37a26 100644
--- a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
diff --git a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
index 9bbae8956f..9bbae8956f 100644
--- a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
diff --git a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
index feddc8c056..feddc8c056 100644
--- a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
diff --git a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
index 472f76c680..472f76c680 100644
--- a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
diff --git a/branches/sca-equinox/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index f56f96e4b9..f56f96e4b9 100644
--- a/branches/sca-equinox/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
index ec40cb7dc5..ec40cb7dc5 100644
--- a/branches/sca-equinox/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
diff --git a/branches/sca-equinox/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index e14c657d80..e14c657d80 100644
--- a/branches/sca-equinox/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-equinox/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
index 39627ae876..39627ae876 100644
--- a/branches/sca-equinox/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
diff --git a/branches/sca-equinox/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
index d5b1b9eedc..d5b1b9eedc 100644
--- a/branches/sca-equinox/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
diff --git a/branches/sca-equinox/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
index fabb554236..fabb554236 100644
--- a/branches/sca-equinox/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
diff --git a/branches/sca-equinox/modules/policy-security-jsr250/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/policy-security-jsr250/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/policy-security-jsr250/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security-jsr250/LICENSE
diff --git a/branches/sca-equinox/modules/policy-security-jsr250/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/policy-security-jsr250/META-INF/MANIFEST.MF
index 0ac36efa2a..0ac36efa2a 100644
--- a/branches/sca-equinox/modules/policy-security-jsr250/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security-jsr250/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/policy-security-jsr250/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/policy-security-jsr250/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/policy-security-jsr250/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security-jsr250/NOTICE
diff --git a/branches/sca-equinox/modules/policy-security-jsr250/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/policy-security-jsr250/pom.xml
index 4a1eeac5f9..4a1eeac5f9 100644
--- a/branches/sca-equinox/modules/policy-security-jsr250/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security-jsr250/pom.xml
diff --git a/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/JSR250Activator.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/JSR250Activator.java
index e6279f4811..e6279f4811 100644
--- a/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/JSR250Activator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/JSR250Activator.java
diff --git a/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/JSR250PolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/JSR250PolicyProcessor.java
index 2622886075..2622886075 100644
--- a/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/JSR250PolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/JSR250PolicyProcessor.java
diff --git a/branches/sca-equinox/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/branches/sca-equinox/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 5feb961dc2..5feb961dc2 100644
--- a/branches/sca-equinox/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java
index e59f06bdf5..e59f06bdf5 100644
--- a/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java
diff --git a/branches/sca-equinox/modules/policy-security-ws/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/policy-security-ws/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/LICENSE
diff --git a/branches/sca-equinox/modules/policy-security-ws/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/META-INF/MANIFEST.MF
index 40f58929d2..40f58929d2 100644
--- a/branches/sca-equinox/modules/policy-security-ws/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/policy-security-ws/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/policy-security-ws/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/NOTICE
diff --git a/branches/sca-equinox/modules/policy-security-ws/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/pom.xml
index 2dfb10cf8a..2dfb10cf8a 100644
--- a/branches/sca-equinox/modules/policy-security-ws/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/pom.xml
diff --git a/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
index cc64a89935..cc64a89935 100644
--- a/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
diff --git a/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyHandler.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyHandler.java
index 51e0e00ffa..51e0e00ffa 100644
--- a/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyHandler.java
diff --git a/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
index d67413eb81..d67413eb81 100644
--- a/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
diff --git a/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProviderFactory.java
index 2faf7bef14..2faf7bef14 100644
--- a/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProviderFactory.java
diff --git a/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/WSSecurityPolicyHandler.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/WSSecurityPolicyHandler.java
index 2a4d36fa0a..2a4d36fa0a 100644
--- a/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/WSSecurityPolicyHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/WSSecurityPolicyHandler.java
diff --git a/branches/sca-equinox/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 71783b1306..71783b1306 100644
--- a/branches/sca-equinox/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index 5bae401538..5bae401538 100644
--- a/branches/sca-equinox/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-equinox/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index 352d6c693e..352d6c693e 100644
--- a/branches/sca-equinox/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-equinox/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java
index 4bdd1c465b..4bdd1c465b 100644
--- a/branches/sca-equinox/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java
diff --git a/branches/sca-equinox/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
index 8fc1a7b669..8fc1a7b669 100644
--- a/branches/sca-equinox/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
diff --git a/branches/sca-equinox/modules/policy-security/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/policy-security/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/policy-security/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/LICENSE
diff --git a/branches/sca-equinox/modules/policy-security/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/policy-security/META-INF/MANIFEST.MF
index 7fa44bee8c..7fa44bee8c 100644
--- a/branches/sca-equinox/modules/policy-security/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/policy-security/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/policy-security/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/policy-security/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/NOTICE
diff --git a/branches/sca-equinox/modules/policy-security/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/policy-security/pom.xml
index e7658d4a46..e7658d4a46 100644
--- a/branches/sca-equinox/modules/policy-security/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/pom.xml
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
index eb0da76acf..eb0da76acf 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
index 0b3dfd5539..0b3dfd5539 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
index 348934bd6c..348934bd6c 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
index c0ed282276..c0ed282276 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
index f6453e2b65..f6453e2b65 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
index 6c0f7d48d0..6c0f7d48d0 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
index 9bbb0e2d33..9bbb0e2d33 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
index dfb6fee180..dfb6fee180 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
index d78c0fc2e3..d78c0fc2e3 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
index e4c4794c52..e4c4794c52 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
index 0ccda91364..0ccda91364 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
index b58b9bb874..b58b9bb874 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
index 185982a749..185982a749 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
index 328c290fad..328c290fad 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
index e1ef32f36c..e1ef32f36c 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
index edff316700..edff316700 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
index 7466001035..7466001035 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
diff --git a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
index 48a42eb711..48a42eb711 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
diff --git a/branches/sca-equinox/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 3a514e6088..3a514e6088 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
index 790424df6b..790424df6b 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
diff --git a/branches/sca-equinox/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index 95263b8836..95263b8836 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-equinox/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
index e1be4ab03c..e1be4ab03c 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
diff --git a/branches/sca-equinox/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
index f5b79af7ee..f5b79af7ee 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
diff --git a/branches/sca-equinox/modules/policy-security/src/main/resources/policy-security-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
index ebb47f2b60..ebb47f2b60 100644
--- a/branches/sca-equinox/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
diff --git a/branches/sca-equinox/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
index 07695f19a9..07695f19a9 100644
--- a/branches/sca-equinox/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
index 53d1a581f0..53d1a581f0 100644
--- a/branches/sca-equinox/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
diff --git a/branches/sca-equinox/modules/policy-transaction/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/policy-transaction/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/LICENSE
diff --git a/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF
index c847400657..c847400657 100644
--- a/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/policy-transaction/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/policy-transaction/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/NOTICE
diff --git a/branches/sca-equinox/modules/policy-transaction/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/pom.xml
index 87d1ea1dd7..87d1ea1dd7 100644
--- a/branches/sca-equinox/modules/policy-transaction/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/pom.xml
diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
index 8a242924ee..8a242924ee 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
index 3c11fef865..3c11fef865 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
index b3e90c23cd..b3e90c23cd 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
index 0de98592cb..0de98592cb 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
index defe12967e..defe12967e 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
index 31beab4fca..31beab4fca 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
index 3339f2e338..3339f2e338 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
index 3a397e10d0..3a397e10d0 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
index 0dfa986177..0dfa986177 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
index f178876a72..f178876a72 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
index 831cd13914..831cd13914 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
index be97090378..be97090378 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
index 0795a4e5cf..0795a4e5cf 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
index 9f9088a380..9f9088a380 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
index 5a7ae5c4cc..5a7ae5c4cc 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 1d034e23a2..1d034e23a2 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 9a35d62cad..9a35d62cad 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
index e9d9fab519..e9d9fab519 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index eeec814f60..eeec814f60 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/resources/log4j.properties b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/resources/log4j.properties
index 698ee41d7e..698ee41d7e 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/resources/log4j.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/resources/log4j.properties
diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
index ff51b131b7..ff51b131b7 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
diff --git a/branches/sca-equinox/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
index 324fa03da6..324fa03da6 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
diff --git a/branches/sca-equinox/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
index e8560d775d..e8560d775d 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
diff --git a/branches/sca-equinox/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
index 544e0f68c0..544e0f68c0 100644
--- a/branches/sca-equinox/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
diff --git a/branches/sca-equinox/modules/policy-xml-ws/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/policy-xml-ws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/policy-xml-ws/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml-ws/LICENSE
diff --git a/branches/sca-equinox/modules/policy-xml-ws/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/policy-xml-ws/META-INF/MANIFEST.MF
index 6241096ee8..6241096ee8 100644
--- a/branches/sca-equinox/modules/policy-xml-ws/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml-ws/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/policy-xml-ws/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/policy-xml-ws/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/policy-xml-ws/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml-ws/NOTICE
diff --git a/branches/sca-equinox/modules/policy-xml-ws/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/policy-xml-ws/pom.xml
index aff813e2da..aff813e2da 100644
--- a/branches/sca-equinox/modules/policy-xml-ws/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml-ws/pom.xml
diff --git a/branches/sca-equinox/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
index 1b0813a0d8..1b0813a0d8 100644
--- a/branches/sca-equinox/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
diff --git a/branches/sca-equinox/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 2e11e31fec..2e11e31fec 100644
--- a/branches/sca-equinox/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java
index 57e3fe8d3a..57e3fe8d3a 100644
--- a/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java
diff --git a/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java
index cb5db57c15..cb5db57c15 100644
--- a/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java
diff --git a/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java
index b0aa1ed905..b0aa1ed905 100644
--- a/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/sca-java-2.x/branches/sca-equinox/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index 814476b4f9..814476b4f9 100644
--- a/branches/sca-equinox/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
diff --git a/branches/sca-equinox/modules/policy-xml/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/policy-xml/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/LICENSE
diff --git a/branches/sca-equinox/modules/policy-xml/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/META-INF/MANIFEST.MF
index 7bb16d73d9..7bb16d73d9 100644
--- a/branches/sca-equinox/modules/policy-xml/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/policy-xml/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/policy-xml/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/NOTICE
diff --git a/branches/sca-equinox/modules/policy-xml/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/pom.xml
index 660416e3a5..660416e3a5 100644
--- a/branches/sca-equinox/modules/policy-xml/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/pom.xml
diff --git a/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
index ae6805c832..ae6805c832 100644
--- a/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
diff --git a/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
index e405da21c7..e405da21c7 100644
--- a/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
diff --git a/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
index a85ef28572..a85ef28572 100644
--- a/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
diff --git a/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
index 3f69df05d8..3f69df05d8 100644
--- a/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
diff --git a/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
index 03cd635596..03cd635596 100644
--- a/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
diff --git a/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
index 93a8433d65..93a8433d65 100644
--- a/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
diff --git a/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
index d0b19af129..d0b19af129 100644
--- a/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
diff --git a/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
index 50d8cb06e2..50d8cb06e2 100644
--- a/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
diff --git a/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
index e928ead4c6..e928ead4c6 100644
--- a/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
diff --git a/branches/sca-equinox/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index c41a0cd01f..c41a0cd01f 100644
--- a/branches/sca-equinox/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
index 40107bb11e..40107bb11e 100644
--- a/branches/sca-equinox/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
diff --git a/branches/sca-equinox/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
index 39964c297d..39964c297d 100644
--- a/branches/sca-equinox/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-equinox/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
index 2dc8a1cdc7..2dc8a1cdc7 100644
--- a/branches/sca-equinox/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
diff --git a/branches/sca-equinox/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index b51a6fba98..b51a6fba98 100644
--- a/branches/sca-equinox/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
diff --git a/branches/sca-equinox/modules/policy/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/policy/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/policy/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/LICENSE
diff --git a/branches/sca-equinox/modules/policy/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/policy/META-INF/MANIFEST.MF
index 1edbc88f0b..1edbc88f0b 100644
--- a/branches/sca-equinox/modules/policy/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/policy/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/policy/NOTICE
index b3e4797aaa..b3e4797aaa 100644
--- a/branches/sca-equinox/modules/policy/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/NOTICE
diff --git a/branches/sca-equinox/modules/policy/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/policy/pom.xml
index 8d30da0d2d..8d30da0d2d 100644
--- a/branches/sca-equinox/modules/policy/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/pom.xml
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
index 6ca4fe72ec..6ca4fe72ec 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
index 2da41675a1..2da41675a1 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
index 22f328f643..22f328f643 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
index bf2cfca924..bf2cfca924 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
index 6db529c7f0..6db529c7f0 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
index ee67006875..ee67006875 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
index 1b225bc918..1b225bc918 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
index c6393e2ada..c6393e2ada 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
index 65c39803d2..65c39803d2 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
index 49bcbae1ae..49bcbae1ae 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
index b16072c214..b16072c214 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
index f4156fc2e6..f4156fc2e6 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
index caa0d04fe3..caa0d04fe3 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
index 28ff9d09d3..28ff9d09d3 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
index 0f43221dd6..0f43221dd6 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
index dbdef38324..dbdef38324 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
index fa95d84c4e..fa95d84c4e 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
index aa6e27c240..aa6e27c240 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
index 2d6bd0eb6f..2d6bd0eb6f 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
index aab03281ba..aab03281ba 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
index a0e2f10f56..a0e2f10f56 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
index 1db29b835e..1db29b835e 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
index 4bd9d5b7c7..4bd9d5b7c7 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
index 98a116fe7b..98a116fe7b 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
index e5002d2cdc..e5002d2cdc 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
index d6f65b1788..d6f65b1788 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
index 2e4c6a9d78..2e4c6a9d78 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
index 1f91710f95..1f91710f95 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
index e9af4912a3..e9af4912a3 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
index c80e68a0be..c80e68a0be 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
index 6d6420017f..6d6420017f 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
index eb97818042..eb97818042 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
diff --git a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
index afb3c035ae..afb3c035ae 100644
--- a/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
diff --git a/branches/sca-equinox/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
index a0e56c1822..a0e56c1822 100644
--- a/branches/sca-equinox/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
diff --git a/branches/sca-equinox/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
index 846b3b24a4..846b3b24a4 100644
--- a/branches/sca-equinox/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
diff --git a/branches/sca-equinox/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
index 636ff5ab45..636ff5ab45 100644
--- a/branches/sca-equinox/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
diff --git a/branches/sca-equinox/modules/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/pom.xml
index 36b264f63e..36b264f63e 100644
--- a/branches/sca-equinox/modules/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/pom.xml
diff --git a/branches/sca-equinox/modules/sca-api/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/sca-api/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/sca-api/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/LICENSE
diff --git a/branches/sca-equinox/modules/sca-api/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/sca-api/META-INF/MANIFEST.MF
index d0585ad7d4..d0585ad7d4 100644
--- a/branches/sca-equinox/modules/sca-api/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/sca-api/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/sca-api/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/sca-api/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/NOTICE
diff --git a/branches/sca-equinox/modules/sca-api/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/sca-api/pom.xml
index 917f1ff59b..917f1ff59b 100644
--- a/branches/sca-equinox/modules/sca-api/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/pom.xml
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
index c32d229a76..c32d229a76 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
index 044deeb632..044deeb632 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/Constants.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
index b1b2af8048..b1b2af8048 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
index 64423a4aa2..64423a4aa2 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
index 63e3907cff..63e3907cff 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
index 7c067a3a43..7c067a3a43 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
index 900d5eecc1..900d5eecc1 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
index 8790aac4fb..8790aac4fb 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
index 1c6b436afa..1c6b436afa 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
index d3543799ed..d3543799ed 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
index bab9713026..bab9713026 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
index 1d1ecdbc13..1d1ecdbc13 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
index a9fc36f769..a9fc36f769 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
index 477053670a..477053670a 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
index f54e421c81..f54e421c81 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
index 86d2d6560d..86d2d6560d 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
index 37f767c1f4..37f767c1f4 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
index 1484d4ac77..1484d4ac77 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
index 13ca9a2931..13ca9a2931 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
index f16bf44808..f16bf44808 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
index 7d3da46ea9..7d3da46ea9 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
index b9483bc9a8..b9483bc9a8 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
index 9e6942651b..9e6942651b 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
index 32654fea17..32654fea17 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
index 1a9288934c..1a9288934c 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
index 0769a94fbb..0769a94fbb 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
index fbc7398da4..fbc7398da4 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
index 57247cd8a3..57247cd8a3 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
index 864a69b19a..864a69b19a 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
index a0abe16068..a0abe16068 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
index 768429cd91..768429cd91 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
index 1021f6e37f..1021f6e37f 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
index aa439cabab..aa439cabab 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
index 6fded2dec8..6fded2dec8 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
diff --git a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
index 1e475cd4c8..1e475cd4c8 100644
--- a/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
diff --git a/branches/sca-equinox/modules/tracing-aspectj/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/tracing-aspectj/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/tracing-aspectj/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/tracing-aspectj/LICENSE
diff --git a/branches/sca-equinox/modules/tracing-aspectj/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/tracing-aspectj/META-INF/MANIFEST.MF
index 061d0ad3e7..061d0ad3e7 100644
--- a/branches/sca-equinox/modules/tracing-aspectj/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/tracing-aspectj/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/tracing-aspectj/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/tracing-aspectj/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/tracing-aspectj/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/tracing-aspectj/NOTICE
diff --git a/branches/sca-equinox/modules/tracing-aspectj/launcher.bat b/sca-java-2.x/branches/sca-equinox/modules/tracing-aspectj/launcher.bat
index a5305f486d..a5305f486d 100644
--- a/branches/sca-equinox/modules/tracing-aspectj/launcher.bat
+++ b/sca-java-2.x/branches/sca-equinox/modules/tracing-aspectj/launcher.bat
diff --git a/branches/sca-equinox/modules/tracing-aspectj/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/tracing-aspectj/pom.xml
index d15ca3bc4b..d15ca3bc4b 100644
--- a/branches/sca-equinox/modules/tracing-aspectj/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/tracing-aspectj/pom.xml
diff --git a/branches/sca-equinox/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java b/sca-java-2.x/branches/sca-equinox/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java
index 8ad64d498b..8ad64d498b 100644
--- a/branches/sca-equinox/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java
diff --git a/branches/sca-equinox/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java b/sca-java-2.x/branches/sca-equinox/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
index 67fe54f396..67fe54f396 100644
--- a/branches/sca-equinox/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
diff --git a/branches/sca-equinox/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java b/sca-java-2.x/branches/sca-equinox/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
index 53ef73573b..53ef73573b 100644
--- a/branches/sca-equinox/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
diff --git a/branches/sca-equinox/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml b/sca-java-2.x/branches/sca-equinox/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
index 60c0132e9a..60c0132e9a 100644
--- a/branches/sca-equinox/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
diff --git a/branches/sca-equinox/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java
index 7b76faaf36..7b76faaf36 100644
--- a/branches/sca-equinox/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java
diff --git a/branches/sca-equinox/modules/workspace-impl/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/workspace-impl/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/LICENSE
diff --git a/branches/sca-equinox/modules/workspace-impl/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/META-INF/MANIFEST.MF
index f4b41fe87d..f4b41fe87d 100644
--- a/branches/sca-equinox/modules/workspace-impl/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/workspace-impl/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/workspace-impl/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/NOTICE
diff --git a/branches/sca-equinox/modules/workspace-impl/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/pom.xml
index 4b280c1db8..4b280c1db8 100644
--- a/branches/sca-equinox/modules/workspace-impl/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/pom.xml
diff --git a/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
index bdfd244293..bdfd244293 100644
--- a/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
diff --git a/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
index e81856df26..e81856df26 100644
--- a/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
diff --git a/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
index 6b7fc2f259..6b7fc2f259 100644
--- a/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
diff --git a/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java
index cc51ff5823..cc51ff5823 100644
--- a/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java
diff --git a/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java
index 71bd9d760d..71bd9d760d 100644
--- a/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java
diff --git a/branches/sca-equinox/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 41d0ebe27d..41d0ebe27d 100644
--- a/branches/sca-equinox/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-equinox/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.builder.ContributionBuilder b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.builder.ContributionBuilder
index 379d0a017e..379d0a017e 100644
--- a/branches/sca-equinox/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.builder.ContributionBuilder
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.builder.ContributionBuilder
diff --git a/branches/sca-equinox/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties
index 0c07a3a30f..0c07a3a30f 100644
--- a/branches/sca-equinox/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties
diff --git a/branches/sca-equinox/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties
index 2e8326c062..2e8326c062 100644
--- a/branches/sca-equinox/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties
diff --git a/branches/sca-equinox/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
index be64c65c45..be64c65c45 100644
--- a/branches/sca-equinox/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
diff --git a/branches/sca-equinox/modules/workspace-xml/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/workspace-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/workspace-xml/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-xml/LICENSE
diff --git a/branches/sca-equinox/modules/workspace-xml/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/workspace-xml/META-INF/MANIFEST.MF
index cb5af2f786..cb5af2f786 100644
--- a/branches/sca-equinox/modules/workspace-xml/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-xml/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/workspace-xml/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/workspace-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/workspace-xml/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-xml/NOTICE
diff --git a/branches/sca-equinox/modules/workspace-xml/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/workspace-xml/pom.xml
index 06fa89819e..06fa89819e 100644
--- a/branches/sca-equinox/modules/workspace-xml/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-xml/pom.xml
diff --git a/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
index 91a6b8dcea..91a6b8dcea 100644
--- a/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
diff --git a/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
index ccdc2dce8c..ccdc2dce8c 100644
--- a/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
diff --git a/branches/sca-equinox/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 9ea7874b52..9ea7874b52 100644
--- a/branches/sca-equinox/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/modules/workspace-xml/src/main/resources/workspace-xml-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/workspace-xml/src/main/resources/workspace-xml-validation-messages.properties
index e054591a31..e054591a31 100644
--- a/branches/sca-equinox/modules/workspace-xml/src/main/resources/workspace-xml-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-xml/src/main/resources/workspace-xml-validation-messages.properties
diff --git a/branches/sca-equinox/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java
index 8e37465039..8e37465039 100644
--- a/branches/sca-equinox/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/workspace/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/workspace/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/modules/workspace/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace/LICENSE
diff --git a/branches/sca-equinox/modules/workspace/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/workspace/META-INF/MANIFEST.MF
index e9a9bf0742..e9a9bf0742 100644
--- a/branches/sca-equinox/modules/workspace/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/workspace/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/workspace/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/modules/workspace/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace/NOTICE
diff --git a/branches/sca-equinox/modules/workspace/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/workspace/pom.xml
index 1fd22b65ed..1fd22b65ed 100644
--- a/branches/sca-equinox/modules/workspace/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace/pom.xml
diff --git a/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java b/sca-java-2.x/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
index e895669d23..e895669d23 100644
--- a/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
diff --git a/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java b/sca-java-2.x/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
index 66f38afec7..66f38afec7 100644
--- a/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
diff --git a/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java b/sca-java-2.x/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
index 2656068bea..2656068bea 100644
--- a/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
diff --git a/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilder.java b/sca-java-2.x/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilder.java
index b7c11f769b..b7c11f769b 100644
--- a/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilder.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilder.java
diff --git a/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderException.java b/sca-java-2.x/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderException.java
index 10c18def10..10c18def10 100644
--- a/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderException.java
diff --git a/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderExtensionPoint.java
index 8200321eec..8200321eec 100644
--- a/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderExtensionPoint.java
diff --git a/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/DefaultContributionBuilderExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/DefaultContributionBuilderExtensionPoint.java
index 1918732a25..1918732a25 100644
--- a/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/DefaultContributionBuilderExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/DefaultContributionBuilderExtensionPoint.java
diff --git a/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
index e41cc3ea83..e41cc3ea83 100644
--- a/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
diff --git a/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java b/sca-java-2.x/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
index 8c2e119493..8c2e119493 100644
--- a/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
diff --git a/branches/sca-equinox/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory b/sca-java-2.x/branches/sca-equinox/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory
index d390d29d90..d390d29d90 100644
--- a/branches/sca-equinox/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory
diff --git a/branches/sca-equinox/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint b/sca-java-2.x/branches/sca-equinox/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint
index 98ad0b72b0..98ad0b72b0 100644
--- a/branches/sca-equinox/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint
+++ b/sca-java-2.x/branches/sca-equinox/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint
diff --git a/branches/sca-equinox/modules/xsd-xml/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/META-INF/MANIFEST.MF
index 0453a2ce74..0453a2ce74 100644
--- a/branches/sca-equinox/modules/xsd-xml/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/xsd-xml/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/pom.xml
index 4f2444c184..4f2444c184 100644
--- a/branches/sca-equinox/modules/xsd-xml/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/pom.xml
diff --git a/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java
index 595795a2d9..595795a2d9 100644
--- a/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java
diff --git a/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
index ef4b5aa0bc..ef4b5aa0bc 100644
--- a/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
diff --git a/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
index c30d3ebbd6..c30d3ebbd6 100644
--- a/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
diff --git a/branches/sca-equinox/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 1ec3d27200..1ec3d27200 100644
--- a/branches/sca-equinox/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-equinox/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index a67ecf063a..a67ecf063a 100644
--- a/branches/sca-equinox/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-equinox/modules/xsd-xml/src/main/resources/xsd-xml-validation-messages.properties b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/src/main/resources/xsd-xml-validation-messages.properties
index ab50456510..ab50456510 100644
--- a/branches/sca-equinox/modules/xsd-xml/src/main/resources/xsd-xml-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/src/main/resources/xsd-xml-validation-messages.properties
diff --git a/branches/sca-equinox/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java
index fbcdf3d861..fbcdf3d861 100644
--- a/branches/sca-equinox/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java
diff --git a/branches/sca-equinox/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java
index a42c916683..a42c916683 100644
--- a/branches/sca-equinox/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java
diff --git a/branches/sca-equinox/modules/xsd-xml/src/test/resources/xsd/greeting.xsd b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/src/test/resources/xsd/greeting.xsd
index 635ca25bfc..635ca25bfc 100644
--- a/branches/sca-equinox/modules/xsd-xml/src/test/resources/xsd/greeting.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/src/test/resources/xsd/greeting.xsd
diff --git a/branches/sca-equinox/modules/xsd-xml/src/test/resources/xsd/name.xsd b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/src/test/resources/xsd/name.xsd
index 300de931ec..300de931ec 100644
--- a/branches/sca-equinox/modules/xsd-xml/src/test/resources/xsd/name.xsd
+++ b/sca-java-2.x/branches/sca-equinox/modules/xsd-xml/src/test/resources/xsd/name.xsd
diff --git a/branches/sca-equinox/modules/xsd/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/xsd/META-INF/MANIFEST.MF
index 0d5adca756..0d5adca756 100644
--- a/branches/sca-equinox/modules/xsd/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/xsd/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/xsd/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/xsd/pom.xml
index f9a3002d09..f9a3002d09 100644
--- a/branches/sca-equinox/modules/xsd/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/xsd/pom.xml
diff --git a/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java b/sca-java-2.x/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java
index 92dce98fa1..92dce98fa1 100644
--- a/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java
diff --git a/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java b/sca-java-2.x/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java
index 08a1c8dd63..08a1c8dd63 100644
--- a/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java
diff --git a/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java b/sca-java-2.x/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java
index 9a973cd095..9a973cd095 100644
--- a/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java
diff --git a/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java
index 60ff6b6fd9..60ff6b6fd9 100644
--- a/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java
diff --git a/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java b/sca-java-2.x/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java
index 5a2b4ec8e6..5a2b4ec8e6 100644
--- a/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java
diff --git a/branches/sca-equinox/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory b/sca-java-2.x/branches/sca-equinox/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory
index ca06127c06..ca06127c06 100644
--- a/branches/sca-equinox/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory
+++ b/sca-java-2.x/branches/sca-equinox/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory
diff --git a/branches/sca-equinox/pom.xml b/sca-java-2.x/branches/sca-equinox/pom.xml
index e973633405..e973633405 100644
--- a/branches/sca-equinox/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/pom.xml
diff --git a/branches/sca-equinox/samples/README b/sca-java-2.x/branches/sca-equinox/samples/README
index 2646fbb73a..2646fbb73a 100644
--- a/branches/sca-equinox/samples/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/README
diff --git a/branches/sca-equinox/samples/binding-echo-extension/README b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/README
index 94716b151f..94716b151f 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/README
diff --git a/branches/sca-equinox/samples/binding-echo-extension/build.xml b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/build.xml
index 5df5981bea..5df5981bea 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/build.xml
diff --git a/branches/sca-equinox/samples/binding-echo-extension/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/pom.xml
index 642971e98f..642971e98f 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/pom.xml
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
index 3fe1598e0d..3fe1598e0d 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
index 0f6fee82be..0f6fee82be 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
index af759dbf93..af759dbf93 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
index 19c9271bb8..19c9271bb8 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
index 39b7065bf0..39b7065bf0 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
index 91697fcd9a..91697fcd9a 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
index 4877bade7f..4877bade7f 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
index 04e6b42dc1..04e6b42dc1 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
index 0efc319af9..0efc319af9 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
index 1cd1e5af4e..1cd1e5af4e 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
index 33dc761aa4..33dc761aa4 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
index 2c2f93514d..2c2f93514d 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
index 7d38e3b7a8..7d38e3b7a8 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
index ee3263bf42..ee3263bf42 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
index deda8d9744..deda8d9744 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
index ffadfc7fff..ffadfc7fff 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
index 6fa5f26977..6fa5f26977 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
index cf55b36fc2..cf55b36fc2 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
index ac610cfb51..ac610cfb51 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
index a8aa609812..a8aa609812 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
index 8ea2395d04..8ea2395d04 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
index 32336dd94f..32336dd94f 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
index 55be293862..55be293862 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 06d53250c1..06d53250c1 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 4ad61f573d..4ad61f573d 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index efa475ef92..efa475ef92 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
index 9b64df4871..9b64df4871 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/Echo.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/Echo.java
index 1d5e973f33..1d5e973f33 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/Echo.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/Echo.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
index ba68dfe908..ba68dfe908 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
index 7383077f18..7383077f18 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
index ab05516622..ab05516622 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/test/resources/EchoBinding.composite b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
index 176d67cc4b..176d67cc4b 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
diff --git a/branches/sca-equinox/samples/binding-echo-extension/src/test/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/resources/definitions.xml
index 1cb1d1c9ba..1cb1d1c9ba 100644
--- a/branches/sca-equinox/samples/binding-echo-extension/src/test/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo-extension/src/test/resources/definitions.xml
diff --git a/branches/sca-equinox/samples/binding-echo/README b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/README
index 2772460cc6..2772460cc6 100644
--- a/branches/sca-equinox/samples/binding-echo/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/README
diff --git a/branches/sca-equinox/samples/binding-echo/binding-echo.png b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/binding-echo.png
index a38d985363..a38d985363 100644
--- a/branches/sca-equinox/samples/binding-echo/binding-echo.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/binding-echo.png
diff --git a/branches/sca-equinox/samples/binding-echo/binding-echo.svg b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/binding-echo.svg
index 5b5051bef5..5b5051bef5 100644
--- a/branches/sca-equinox/samples/binding-echo/binding-echo.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/binding-echo.svg
diff --git a/branches/sca-equinox/samples/binding-echo/build.xml b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/build.xml
index 7689ef3a54..7689ef3a54 100644
--- a/branches/sca-equinox/samples/binding-echo/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/build.xml
diff --git a/branches/sca-equinox/samples/binding-echo/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/pom.xml
index 35ac6ad368..35ac6ad368 100644
--- a/branches/sca-equinox/samples/binding-echo/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/pom.xml
diff --git a/branches/sca-equinox/samples/binding-echo/src/main/java/echo/Echo.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/src/main/java/echo/Echo.java
index 1d5e973f33..1d5e973f33 100644
--- a/branches/sca-equinox/samples/binding-echo/src/main/java/echo/Echo.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/src/main/java/echo/Echo.java
diff --git a/branches/sca-equinox/samples/binding-echo/src/main/java/echo/EchoBindingClient.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
index 21bdff4011..21bdff4011 100644
--- a/branches/sca-equinox/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
diff --git a/branches/sca-equinox/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
index ba68dfe908..ba68dfe908 100644
--- a/branches/sca-equinox/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-equinox/samples/binding-echo/src/main/resources/EchoBinding.composite b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/src/main/resources/EchoBinding.composite
index 94612fb325..94612fb325 100644
--- a/branches/sca-equinox/samples/binding-echo/src/main/resources/EchoBinding.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/src/main/resources/EchoBinding.composite
diff --git a/branches/sca-equinox/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
index 1a597fc80f..1a597fc80f 100644
--- a/branches/sca-equinox/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/README b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/README
index 51f4b07e81..51f4b07e81 100644
--- a/branches/sca-equinox/samples/calculator-distributed/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/README
diff --git a/branches/sca-equinox/samples/calculator-distributed/build.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/build.xml
index 069a473e90..069a473e90 100644
--- a/branches/sca-equinox/samples/calculator-distributed/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/build.xml
diff --git a/branches/sca-equinox/samples/calculator-distributed/calculator-distributed.png b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/calculator-distributed.png
index 7c0e175664..7c0e175664 100644
--- a/branches/sca-equinox/samples/calculator-distributed/calculator-distributed.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/calculator-distributed.png
diff --git a/branches/sca-equinox/samples/calculator-distributed/calculator-distributed.svg b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/calculator-distributed.svg
index be5a4b8185..be5a4b8185 100644
--- a/branches/sca-equinox/samples/calculator-distributed/calculator-distributed.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/calculator-distributed.svg
diff --git a/branches/sca-equinox/samples/calculator-distributed/cloud.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/cloud.composite
index 85e2f9c7f3..85e2f9c7f3 100644
--- a/branches/sca-equinox/samples/calculator-distributed/cloud.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/cloud.composite
diff --git a/branches/sca-equinox/samples/calculator-distributed/domain.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/domain.composite
index 643e22d0cf..643e22d0cf 100644
--- a/branches/sca-equinox/samples/calculator-distributed/domain.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/domain.composite
diff --git a/branches/sca-equinox/samples/calculator-distributed/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/pom.xml
index 056fd9c978..056fd9c978 100644
--- a/branches/sca-equinox/samples/calculator-distributed/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/AddService.java
index d7dc4473ad..d7dc4473ad 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
index e9b7e254e5..e9b7e254e5 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
index da869e00fd..da869e00fd 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
index 78ab9c6ee0..78ab9c6ee0 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
index 1010207154..1010207154 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
index 306ce68327..306ce68327 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
index 50600eaedc..50600eaedc 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
index 95d8934665..95d8934665 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchDomain.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
index 8b4fe566a1..8b4fe566a1 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
index ed7fe55abc..ed7fe55abc 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
index 8f29cc17aa..8f29cc17aa 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
index 9ad132b0d4..9ad132b0d4 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
index 172676a3c7..172676a3c7 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
index 1b1c0291e2..1b1c0291e2 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
index b770dbe8d4..b770dbe8d4 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 6c0ffe4ac0..6c0ffe4ac0 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
index 66caf0d17b..66caf0d17b 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
index 8c311553c3..8c311553c3 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
index cd6e934854..cd6e934854 100644
--- a/branches/sca-equinox/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
diff --git a/branches/sca-equinox/samples/calculator-distributed/workspace.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/workspace.xml
index 7d6d3dbdbd..7d6d3dbdbd 100644
--- a/branches/sca-equinox/samples/calculator-distributed/workspace.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-distributed/workspace.xml
diff --git a/branches/sca-equinox/samples/calculator-equinox/README b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/README
index cde5fe981f..cde5fe981f 100644
--- a/branches/sca-equinox/samples/calculator-equinox/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/README
diff --git a/branches/sca-equinox/samples/calculator-equinox/calculator.png b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-equinox/samples/calculator-equinox/calculator.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/calculator.png
diff --git a/branches/sca-equinox/samples/calculator-equinox/calculator.svg b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/branches/sca-equinox/samples/calculator-equinox/calculator.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/calculator.svg
diff --git a/branches/sca-equinox/samples/calculator-equinox/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/pom.xml
index 1dbee240c7..1dbee240c7 100644
--- a/branches/sca-equinox/samples/calculator-equinox/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
index c193b2ce66..c193b2ce66 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/resources/Calculator.composite
index 913081b9be..913081b9be 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
index 00e5422930..00e5422930 100644
--- a/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/README b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/README
index bd66eee1c9..bd66eee1c9 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/README
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/build.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/build.xml
index 7afa23a07f..7afa23a07f 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/build.xml
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/calculator.png b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/calculator.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/calculator.png
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/calculator.svg b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/calculator.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/calculator.svg
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/pom.xml
index aebd80828a..aebd80828a 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
index 5a1e7a638a..5a1e7a638a 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
index caf4d358df..caf4d358df 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
index 2bce187049..2bce187049 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
index ae4ed12b7b..ae4ed12b7b 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
index cd91935f08..cd91935f08 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
index c85357fcd8..c85357fcd8 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
index 1b669084d9..1b669084d9 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
index b48fb90148..b48fb90148 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
index fe4097640b..fe4097640b 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
index 595626e672..595626e672 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
index d91bf88d96..d91bf88d96 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
index 0e7cb86633..0e7cb86633 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
index f62125eaa9..f62125eaa9 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/definitions.xml
index 6cccde0d13..6cccde0d13 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
index 157570c3df..157570c3df 100644
--- a/branches/sca-equinox/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-equinox/samples/calculator-lean/README b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/README
index a8aff232c6..a8aff232c6 100644
--- a/branches/sca-equinox/samples/calculator-lean/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/README
diff --git a/branches/sca-equinox/samples/calculator-lean/calculator.png b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-equinox/samples/calculator-lean/calculator.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/calculator.png
diff --git a/branches/sca-equinox/samples/calculator-lean/calculator.svg b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/calculator.svg
index 0615925c50..0615925c50 100644
--- a/branches/sca-equinox/samples/calculator-lean/calculator.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/calculator.svg
diff --git a/branches/sca-equinox/samples/calculator-lean/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/pom.xml
index 3b565dd5a8..3b565dd5a8 100644
--- a/branches/sca-equinox/samples/calculator-lean/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
index 2bb8f96dcf..2bb8f96dcf 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/resources/Calculator.composite
index 913081b9be..913081b9be 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-lean/src/main/resources/CalculatorTest.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/resources/CalculatorTest.composite
index 906e2a3918..906e2a3918 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/main/resources/CalculatorTest.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/main/resources/CalculatorTest.composite
diff --git a/branches/sca-equinox/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
index f965e710d5..f965e710d5 100644
--- a/branches/sca-equinox/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/META-INF/MANIFEST.MF
index bb6c2d4d35..bb6c2d4d35 100644
--- a/branches/sca-equinox/samples/calculator-osgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/samples/calculator-osgi/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/pom.xml
index cda7d6edbb..cda7d6edbb 100644
--- a/branches/sca-equinox/samples/calculator-osgi/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
index 4408568629..4408568629 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
index adbd18a9e4..adbd18a9e4 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-osgi/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/resources/Calculator.composite
index 913081b9be..913081b9be 100644
--- a/branches/sca-equinox/samples/calculator-osgi/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-osgi/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-rcp/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/META-INF/MANIFEST.MF
index 3e2adcb942..3e2adcb942 100644
--- a/branches/sca-equinox/samples/calculator-rcp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/samples/calculator-rcp/build.properties b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/build.properties
index 0530eb648b..0530eb648b 100644
--- a/branches/sca-equinox/samples/calculator-rcp/build.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/build.properties
diff --git a/branches/sca-equinox/samples/calculator-rcp/icons/alt_window_16.gif b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/icons/alt_window_16.gif
index 05626b17d8..05626b17d8 100644
--- a/branches/sca-equinox/samples/calculator-rcp/icons/alt_window_16.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/icons/alt_window_16.gif
diff --git a/branches/sca-equinox/samples/calculator-rcp/icons/alt_window_32.gif b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/icons/alt_window_32.gif
index b432f88339..b432f88339 100644
--- a/branches/sca-equinox/samples/calculator-rcp/icons/alt_window_32.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/icons/alt_window_32.gif
diff --git a/branches/sca-equinox/samples/calculator-rcp/plugin.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/plugin.xml
index 1fb5acd9b5..1fb5acd9b5 100644
--- a/branches/sca-equinox/samples/calculator-rcp/plugin.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/plugin.xml
diff --git a/branches/sca-equinox/samples/calculator-rcp/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/pom.xml
index 5c02c8cfde..5c02c8cfde 100644
--- a/branches/sca-equinox/samples/calculator-rcp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/Calculator.composite
index 913081b9be..913081b9be 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java
index adbd18a9e4..adbd18a9e4 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
index 4fd7b8520d..4fd7b8520d 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Application.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Application.java
index 137c7307ac..137c7307ac 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Application.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Application.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationActionBarAdvisor.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationActionBarAdvisor.java
index 2fccfb2d77..2fccfb2d77 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationActionBarAdvisor.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationActionBarAdvisor.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchAdvisor.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchAdvisor.java
index ac1893509c..ac1893509c 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchAdvisor.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchAdvisor.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchWindowAdvisor.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchWindowAdvisor.java
index 6378decf20..6378decf20 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchWindowAdvisor.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchWindowAdvisor.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Perspective.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Perspective.java
index 445b4b65b2..445b4b65b2 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Perspective.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Perspective.java
diff --git a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/View.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/View.java
index f95c1e029c..f95c1e029c 100644
--- a/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/View.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/View.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/README b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/README
index 837b5ce75f..837b5ce75f 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/README
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/build.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/build.xml
index ca75625b42..ca75625b42 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/build.xml
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/calculator-rmi-reference.png b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/calculator-rmi-reference.png
index 8c76b77a9f..8c76b77a9f 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/calculator-rmi-reference.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/calculator-rmi-reference.png
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/calculator-rmi-reference.svg b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/calculator-rmi-reference.svg
index ba802e6717..ba802e6717 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/calculator-rmi-reference.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/calculator-rmi-reference.svg
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/pom.xml
index 95033d191c..95033d191c 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
index cd1076c3f1..cd1076c3f1 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
index d310dad4b1..d310dad4b1 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
index f28f0ca179..f28f0ca179 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
index f310e5269c..f310e5269c 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 15e00f5946..15e00f5946 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/branches/sca-equinox/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/README b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/README
index 454cdc0d37..454cdc0d37 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/README
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/build.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/build.xml
index f98f35e4b0..f98f35e4b0 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/build.xml
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/calculator-rmi-service.png b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/calculator-rmi-service.png
index 574f5eb14b..574f5eb14b 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/calculator-rmi-service.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/calculator-rmi-service.png
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/calculator-rmi-service.svg b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/calculator-rmi-service.svg
index 9253110f98..9253110f98 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/calculator-rmi-service.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/calculator-rmi-service.svg
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/pom.xml
index d13f0a74d9..d13f0a74d9 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
index b698163c1b..b698163c1b 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
index 3ddcef61df..3ddcef61df 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
index f28f0ca179..f28f0ca179 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
index c1a15e9107..c1a15e9107 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
index 8943dd24f6..8943dd24f6 100644
--- a/branches/sca-equinox/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/branches/sca-equinox/samples/calculator-script/README b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/README
index ab1dda13df..ab1dda13df 100644
--- a/branches/sca-equinox/samples/calculator-script/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/README
diff --git a/branches/sca-equinox/samples/calculator-script/build.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/build.xml
index 429d638ca5..429d638ca5 100644
--- a/branches/sca-equinox/samples/calculator-script/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/build.xml
diff --git a/branches/sca-equinox/samples/calculator-script/calculator-script.png b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/calculator-script.png
index d3f8c491c3..d3f8c491c3 100644
--- a/branches/sca-equinox/samples/calculator-script/calculator-script.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/calculator-script.png
diff --git a/branches/sca-equinox/samples/calculator-script/calculator-script.svg b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/calculator-script.svg
index 16939f9310..16939f9310 100644
--- a/branches/sca-equinox/samples/calculator-script/calculator-script.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/calculator-script.svg
diff --git a/branches/sca-equinox/samples/calculator-script/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/pom.xml
index 38100c0eff..38100c0eff 100644
--- a/branches/sca-equinox/samples/calculator-script/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
index 243d1562dc..243d1562dc 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/resources/Calculator.composite
index 8a765e6153..8a765e6153 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
index 1d4d221364..1d4d221364 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
index d6f27ca7f5..d6f27ca7f5 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
index 132a1d13b0..132a1d13b0 100644
--- a/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/branches/sca-equinox/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
index fea8f62110..fea8f62110 100644
--- a/branches/sca-equinox/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/README b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/README
index c88b92b206..c88b92b206 100644
--- a/branches/sca-equinox/samples/calculator-webapp/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/README
diff --git a/branches/sca-equinox/samples/calculator-webapp/calculator-web.png b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/calculator-web.png
index 896ddc4093..896ddc4093 100644
--- a/branches/sca-equinox/samples/calculator-webapp/calculator-web.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/calculator-web.png
diff --git a/branches/sca-equinox/samples/calculator-webapp/calculator-web.svg b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/calculator-web.svg
index 00ed27556f..00ed27556f 100644
--- a/branches/sca-equinox/samples/calculator-webapp/calculator-web.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/calculator-web.svg
diff --git a/branches/sca-equinox/samples/calculator-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/pom.xml
index 8645b70e03..8645b70e03 100644
--- a/branches/sca-equinox/samples/calculator-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
index 4787b728f4..4787b728f4 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index bf3b0303ec..bf3b0303ec 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/resources/Calculator.composite
index 50c23af0b2..50c23af0b2 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
index fe09ab2e1b..fe09ab2e1b 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
index b5a828d55b..b5a828d55b 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/calc.jsp b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/calc.jsp
index 4bc5c984dd..4bc5c984dd 100644
--- a/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/README b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/README
index a6e6c897e4..a6e6c897e4 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/README
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/calculator-web.png b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/calculator-web.png
index f482b8d1c8..f482b8d1c8 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/calculator-web.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/calculator-web.png
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/calculator-web.svg b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/calculator-web.svg
index 1b7015b156..1b7015b156 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/calculator-web.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/calculator-web.svg
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml
index 7e823c0f9e..7e823c0f9e 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
index c3c789e745..c3c789e745 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
index 46ec182124..46ec182124 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
index 4787b728f4..4787b728f4 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index bf3b0303ec..bf3b0303ec 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
index c8653806aa..c8653806aa 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
index 9625c0d692..9625c0d692 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
index 23a62680c5..23a62680c5 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
index 4d511f887e..4d511f887e 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index 858e87a34f..858e87a34f 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
index b6b244244b..b6b244244b 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
index 4611669bbd..4611669bbd 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/security.properties b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
index a7a6f3aa9c..a7a6f3aa9c 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
index fe09ab2e1b..fe09ab2e1b 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 355ace0100..355ace0100 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
index d3a62d39f4..d3a62d39f4 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
index 4c4366747d..4c4366747d 100644
--- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/README b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/README
index a6e6c897e4..a6e6c897e4 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/README
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/calculator-web.png b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/calculator-web.png
index f482b8d1c8..f482b8d1c8 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/calculator-web.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/calculator-web.png
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/calculator-web.svg b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/calculator-web.svg
index 1b7015b156..1b7015b156 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/calculator-web.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/calculator-web.svg
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml
index 64eec7306a..64eec7306a 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
index c3c789e745..c3c789e745 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
index a7049729f7..a7049729f7 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
index 4787b728f4..4787b728f4 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index bf3b0303ec..bf3b0303ec 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
index 6415d5a896..6415d5a896 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
index fe09ab2e1b..fe09ab2e1b 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 3b6a4795dd..3b6a4795dd 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
index d3a62d39f4..d3a62d39f4 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/calc.jsp b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
index 4c4366747d..4c4366747d 100644
--- a/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-equinox/samples/calculator/README b/sca-java-2.x/branches/sca-equinox/samples/calculator/README
index ceb532faed..ceb532faed 100644
--- a/branches/sca-equinox/samples/calculator/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/README
diff --git a/branches/sca-equinox/samples/calculator/build.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator/build.xml
index c4b755ef94..c4b755ef94 100644
--- a/branches/sca-equinox/samples/calculator/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/build.xml
diff --git a/branches/sca-equinox/samples/calculator/calculator.png b/sca-java-2.x/branches/sca-equinox/samples/calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-equinox/samples/calculator/calculator.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/calculator.png
diff --git a/branches/sca-equinox/samples/calculator/calculator.svg b/sca-java-2.x/branches/sca-equinox/samples/calculator/calculator.svg
index 0615925c50..0615925c50 100644
--- a/branches/sca-equinox/samples/calculator/calculator.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/calculator.svg
diff --git a/branches/sca-equinox/samples/calculator/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/calculator/pom.xml
index f2196d175b..f2196d175b 100644
--- a/branches/sca-equinox/samples/calculator/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/pom.xml
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorClient.java
index 3f0bcd15c9..3f0bcd15c9 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-equinox/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-equinox/samples/calculator/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/resources/Calculator.composite
index 90872041b0..90872041b0 100644
--- a/branches/sca-equinox/samples/calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
index 1a880d2656..1a880d2656 100644
--- a/branches/sca-equinox/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-equinox/samples/callback-ws-client/README b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/README
index 66121362c9..66121362c9 100644
--- a/branches/sca-equinox/samples/callback-ws-client/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/README
diff --git a/branches/sca-equinox/samples/callback-ws-client/build.xml b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/build.xml
index 8698c6018d..8698c6018d 100644
--- a/branches/sca-equinox/samples/callback-ws-client/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/build.xml
diff --git a/branches/sca-equinox/samples/callback-ws-client/callback-ws-client.png b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/callback-ws-client.png
index 802ef604a7..802ef604a7 100644
--- a/branches/sca-equinox/samples/callback-ws-client/callback-ws-client.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/callback-ws-client.png
diff --git a/branches/sca-equinox/samples/callback-ws-client/callback-ws-client.svg b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/callback-ws-client.svg
index f49aeadbbf..f49aeadbbf 100644
--- a/branches/sca-equinox/samples/callback-ws-client/callback-ws-client.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/callback-ws-client.svg
diff --git a/branches/sca-equinox/samples/callback-ws-client/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/pom.xml
index 6e462d95dd..6e462d95dd 100644
--- a/branches/sca-equinox/samples/callback-ws-client/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/pom.xml
diff --git a/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClient.java b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClient.java
index e515b55788..e515b55788 100644
--- a/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClient.java
diff --git a/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
index 1ac33872b7..1ac33872b7 100644
--- a/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
diff --git a/branches/sca-equinox/samples/callback-ws-client/src/main/java/myserver/MyService.java b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/java/myserver/MyService.java
index 1850eae1bc..1850eae1bc 100644
--- a/branches/sca-equinox/samples/callback-ws-client/src/main/java/myserver/MyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/java/myserver/MyService.java
diff --git a/branches/sca-equinox/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
index bf5f87a4f9..bf5f87a4f9 100644
--- a/branches/sca-equinox/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
diff --git a/branches/sca-equinox/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
index 314747d548..314747d548 100644
--- a/branches/sca-equinox/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/callback-ws-client/src/main/resources/myapp.composite b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/resources/myapp.composite
index 5b776d6df8..5b776d6df8 100644
--- a/branches/sca-equinox/samples/callback-ws-client/src/main/resources/myapp.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/main/resources/myapp.composite
diff --git a/branches/sca-equinox/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
index af343c637c..af343c637c 100644
--- a/branches/sca-equinox/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
diff --git a/branches/sca-equinox/samples/callback-ws-service/README b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/README
index 2c65f745a6..2c65f745a6 100644
--- a/branches/sca-equinox/samples/callback-ws-service/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/README
diff --git a/branches/sca-equinox/samples/callback-ws-service/build.xml b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/build.xml
index c91dd88a8c..c91dd88a8c 100644
--- a/branches/sca-equinox/samples/callback-ws-service/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/build.xml
diff --git a/branches/sca-equinox/samples/callback-ws-service/callback-ws-service.png b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/callback-ws-service.png
index 772ac38431..772ac38431 100644
--- a/branches/sca-equinox/samples/callback-ws-service/callback-ws-service.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/callback-ws-service.png
diff --git a/branches/sca-equinox/samples/callback-ws-service/callback-ws-service.svg b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/callback-ws-service.svg
index ff0a1d307b..ff0a1d307b 100644
--- a/branches/sca-equinox/samples/callback-ws-service/callback-ws-service.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/callback-ws-service.svg
diff --git a/branches/sca-equinox/samples/callback-ws-service/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/pom.xml
index 4906c5359d..4906c5359d 100644
--- a/branches/sca-equinox/samples/callback-ws-service/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/pom.xml
diff --git a/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
index da3844dbf3..da3844dbf3 100644
--- a/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
diff --git a/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyService.java b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyService.java
index 1850eae1bc..1850eae1bc 100644
--- a/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyService.java
diff --git a/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
index bf5f87a4f9..bf5f87a4f9 100644
--- a/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
diff --git a/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
index 25469def5c..25469def5c 100644
--- a/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
diff --git a/branches/sca-equinox/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
index 35f7f60c2e..35f7f60c2e 100644
--- a/branches/sca-equinox/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/callback-ws-service/src/main/resources/callbackws.composite b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/resources/callbackws.composite
index a09e638896..a09e638896 100644
--- a/branches/sca-equinox/samples/callback-ws-service/src/main/resources/callbackws.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/main/resources/callbackws.composite
diff --git a/branches/sca-equinox/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
index 1b17e10556..1b17e10556 100644
--- a/branches/sca-equinox/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
diff --git a/branches/sca-equinox/samples/callbacks-jms/README b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/README
index b5e130e2fc..b5e130e2fc 100644
--- a/branches/sca-equinox/samples/callbacks-jms/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/README
diff --git a/branches/sca-equinox/samples/callbacks-jms/build.xml b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/build.xml
index 665feeca71..665feeca71 100644
--- a/branches/sca-equinox/samples/callbacks-jms/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/build.xml
diff --git a/branches/sca-equinox/samples/callbacks-jms/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/pom.xml
index 2e7270587f..2e7270587f 100644
--- a/branches/sca-equinox/samples/callbacks-jms/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/pom.xml
diff --git a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java
index 775663cdff..775663cdff 100644
--- a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java
diff --git a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java
index 69f5751379..69f5751379 100644
--- a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java
diff --git a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java
index 882bcf8479..882bcf8479 100644
--- a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java
diff --git a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderService.java b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderService.java
index 9f6d90577c..9f6d90577c 100644
--- a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderService.java
diff --git a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java
index 3393ae5dca..3393ae5dca 100644
--- a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java
diff --git a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java
index dd963bc1b0..dd963bc1b0 100644
--- a/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java
diff --git a/branches/sca-equinox/samples/callbacks-jms/src/main/resources/callbacks.composite b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/resources/callbacks.composite
index 94dd29c45d..94dd29c45d 100644
--- a/branches/sca-equinox/samples/callbacks-jms/src/main/resources/callbacks.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/resources/callbacks.composite
diff --git a/branches/sca-equinox/samples/callbacks-jms/src/main/resources/jndi.properties b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/resources/jndi.properties
index 698aeb1711..698aeb1711 100644
--- a/branches/sca-equinox/samples/callbacks-jms/src/main/resources/jndi.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/main/resources/jndi.properties
diff --git a/branches/sca-equinox/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java
index 967fc42c64..967fc42c64 100644
--- a/branches/sca-equinox/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java
diff --git a/branches/sca-equinox/samples/customer-dojo/README b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/README
index 9c1729123f..9c1729123f 100644
--- a/branches/sca-equinox/samples/customer-dojo/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/README
diff --git a/branches/sca-equinox/samples/customer-dojo/build-dojo.xml b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/build-dojo.xml
index 8c6bd99484..8c6bd99484 100644
--- a/branches/sca-equinox/samples/customer-dojo/build-dojo.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/build-dojo.xml
diff --git a/branches/sca-equinox/samples/customer-dojo/build.xml b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/build.xml
index 95813af65a..95813af65a 100644
--- a/branches/sca-equinox/samples/customer-dojo/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/build.xml
diff --git a/branches/sca-equinox/samples/customer-dojo/customer-dojo-jsonrpc.png b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/customer-dojo-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/branches/sca-equinox/samples/customer-dojo/customer-dojo-jsonrpc.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/customer-dojo-jsonrpc.png
diff --git a/branches/sca-equinox/samples/customer-dojo/customer-dojo-jsonrpc.svg b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/customer-dojo-jsonrpc.svg
index d5c3bc5d3e..d5c3bc5d3e 100644
--- a/branches/sca-equinox/samples/customer-dojo/customer-dojo-jsonrpc.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/customer-dojo-jsonrpc.svg
diff --git a/branches/sca-equinox/samples/customer-dojo/customer.sql b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/customer.sql
index a3caf8e050..a3caf8e050 100644
--- a/branches/sca-equinox/samples/customer-dojo/customer.sql
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/customer.sql
diff --git a/branches/sca-equinox/samples/customer-dojo/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/pom.xml
index ea23f4f53b..ea23f4f53b 100644
--- a/branches/sca-equinox/samples/customer-dojo/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/pom.xml
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/Customer.java b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/Customer.java
index 6d207ea2ef..6d207ea2ef 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/Customer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/Customer.java
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerCollection.java b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerCollection.java
index 5ad39aad5c..5ad39aad5c 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerCollection.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerCollection.java
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java
index c0a2f25f15..c0a2f25f15 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerService.java b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerService.java
index 7915cc6e77..7915cc6e77 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerService.java
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java
index 0cba7d8bc1..0cba7d8bc1 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/java/launch/Launch.java b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/launch/Launch.java
index a51ab605bc..a51ab605bc 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/java/launch/Launch.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/java/launch/Launch.java
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/orm.xml b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/orm.xml
index 64be295302..64be295302 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/orm.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/orm.xml
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/persistence.xml b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/persistence.xml
index 5add897279..5add897279 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/persistence.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/persistence.xml
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml
index 136326d1d3..136326d1d3 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/resources/content/customer.html b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/resources/content/customer.html
index dbc8aad9d0..dbc8aad9d0 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/resources/content/customer.html
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/resources/content/customer.html
diff --git a/branches/sca-equinox/samples/customer-dojo/src/main/resources/customer.composite b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/resources/customer.composite
index 4c370f2a9f..4c370f2a9f 100644
--- a/branches/sca-equinox/samples/customer-dojo/src/main/resources/customer.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/customer-dojo/src/main/resources/customer.composite
diff --git a/branches/sca-equinox/samples/databinding-echo/README b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/README
index 67c1aa32d5..67c1aa32d5 100644
--- a/branches/sca-equinox/samples/databinding-echo/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/README
diff --git a/branches/sca-equinox/samples/databinding-echo/build.xml b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/build.xml
index 7f2483f6fb..7f2483f6fb 100644
--- a/branches/sca-equinox/samples/databinding-echo/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/build.xml
diff --git a/branches/sca-equinox/samples/databinding-echo/databinding-echo.png b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/databinding-echo.png
index afbbfff285..afbbfff285 100644
--- a/branches/sca-equinox/samples/databinding-echo/databinding-echo.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/databinding-echo.png
diff --git a/branches/sca-equinox/samples/databinding-echo/databinding-echo.svg b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/databinding-echo.svg
index 87964abf86..87964abf86 100644
--- a/branches/sca-equinox/samples/databinding-echo/databinding-echo.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/databinding-echo.svg
diff --git a/branches/sca-equinox/samples/databinding-echo/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/pom.xml
index 89fa6872c0..89fa6872c0 100644
--- a/branches/sca-equinox/samples/databinding-echo/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/pom.xml
diff --git a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
index 5679614164..5679614164 100644
--- a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
diff --git a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
index ff8968837d..ff8968837d 100644
--- a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
diff --git a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Echo.java b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Echo.java
index 73da41b55e..73da41b55e 100644
--- a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Echo.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Echo.java
diff --git a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
index 9ec3819899..9ec3819899 100644
--- a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
diff --git a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface1.java b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface1.java
index 81d3581f85..81d3581f85 100644
--- a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface1.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface1.java
diff --git a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface2.java b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface2.java
index 543d51cb95..543d51cb95 100644
--- a/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface2.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface2.java
diff --git a/branches/sca-equinox/samples/databinding-echo/src/main/resources/EchoDataBinding.composite b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
index 30b77a6152..30b77a6152 100644
--- a/branches/sca-equinox/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
diff --git a/branches/sca-equinox/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
index ef2308aa73..ef2308aa73 100644
--- a/branches/sca-equinox/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
diff --git a/branches/sca-equinox/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
index 43434d8cee..43434d8cee 100644
--- a/branches/sca-equinox/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
diff --git a/branches/sca-equinox/samples/domain-management/README b/sca-java-2.x/branches/sca-equinox/samples/domain-management/README
index 6280a28028..6280a28028 100644
--- a/branches/sca-equinox/samples/domain-management/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/README
diff --git a/branches/sca-equinox/samples/domain-management/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/domain-management/pom.xml
index 9b3961146a..9b3961146a 100644
--- a/branches/sca-equinox/samples/domain-management/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/pom.xml
diff --git a/branches/sca-equinox/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
index a8f9b3da43..a8f9b3da43 100644
--- a/branches/sca-equinox/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
diff --git a/branches/sca-equinox/samples/domain-management/src/main/java/manager/DistributeComponents.java b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/DistributeComponents.java
index f3faea4f15..f3faea4f15 100644
--- a/branches/sca-equinox/samples/domain-management/src/main/java/manager/DistributeComponents.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/DistributeComponents.java
diff --git a/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListComponents.java b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListComponents.java
index b8dee12962..b8dee12962 100644
--- a/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListComponents.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListComponents.java
diff --git a/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListDependencies.java b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListDependencies.java
index 9e57afbee3..9e57afbee3 100644
--- a/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListDependencies.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListDependencies.java
diff --git a/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListDeployables.java b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListDeployables.java
index f5f0b9c655..f5f0b9c655 100644
--- a/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListDeployables.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/ListDeployables.java
diff --git a/branches/sca-equinox/samples/domain-management/src/main/java/manager/WireComponents.java b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/WireComponents.java
index acc18a6293..acc18a6293 100644
--- a/branches/sca-equinox/samples/domain-management/src/main/java/manager/WireComponents.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/main/java/manager/WireComponents.java
diff --git a/branches/sca-equinox/samples/domain-management/src/test/java/services/Cart.java b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/java/services/Cart.java
index 9e6226d963..9e6226d963 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/java/services/Cart.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/java/services/Cart.java
diff --git a/branches/sca-equinox/samples/domain-management/src/test/java/services/Item.java b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/java/services/Item.java
index 81cefcdbef..81cefcdbef 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/java/services/Item.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/java/services/Item.java
diff --git a/branches/sca-equinox/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java
index c32853b3a9..c32853b3a9 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java
diff --git a/branches/sca-equinox/samples/domain-management/src/test/java/services/ShoppingCartImpl.java b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/java/services/ShoppingCartImpl.java
index 30abfe77a0..30abfe77a0 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/java/services/ShoppingCartImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/java/services/ShoppingCartImpl.java
diff --git a/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/assets.xml b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/assets.xml
index 10693a89e6..10693a89e6 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/assets.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/assets.xml
diff --git a/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/client.xml b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/client.xml
index 5b34693bee..5b34693bee 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/client.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/client.xml
diff --git a/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/store.xml b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/store.xml
index d19b7eb161..d19b7eb161 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/store.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/assembly/store.xml
diff --git a/branches/sca-equinox/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml
index 33fe814c3a..33fe814c3a 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml
index 14e1cdb672..14e1cdb672 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/domain-management/src/test/resources/client/client.composite b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/client/client.composite
index 1279b319c4..1279b319c4 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/resources/client/client.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/client/client.composite
diff --git a/branches/sca-equinox/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml
index 52348106f2..52348106f2 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/domain-management/src/test/resources/store/store.composite b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/store/store.composite
index d4f18771d8..d4f18771d8 100644
--- a/branches/sca-equinox/samples/domain-management/src/test/resources/store/store.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/domain-management/src/test/resources/store/store.composite
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/README b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/README
index 3668a7705e..3668a7705e 100644
--- a/branches/sca-equinox/samples/feed-aggregator-webapp/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/README
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/feed-aggregator-webapp.png b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
index 1af95a5eff..1af95a5eff 100644
--- a/branches/sca-equinox/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
index a861a5c50f..a861a5c50f 100644
--- a/branches/sca-equinox/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml
index 7709d9448c..7709d9448c 100644
--- a/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
index d4adf03851..d4adf03851 100644
--- a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
index dec073c36b..dec073c36b 100644
--- a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
index f7ead126a7..f7ead126a7 100644
--- a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
index 736563098f..736563098f 100644
--- a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
index b67fe843ca..b67fe843ca 100644
--- a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
index dea3980e4d..dea3980e4d 100644
--- a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/index.html b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/index.html
index 7b33391a87..7b33391a87 100644
--- a/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/index.html
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator-webapp/src/main/webapp/index.html
diff --git a/branches/sca-equinox/samples/feed-aggregator/README b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/README
index f73baec2fd..f73baec2fd 100644
--- a/branches/sca-equinox/samples/feed-aggregator/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/README
diff --git a/branches/sca-equinox/samples/feed-aggregator/build.xml b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/build.xml
index 0ab6fed7fc..0ab6fed7fc 100644
--- a/branches/sca-equinox/samples/feed-aggregator/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/build.xml
diff --git a/branches/sca-equinox/samples/feed-aggregator/feed-aggregator.png b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/feed-aggregator.png
index c8fea8a7b8..c8fea8a7b8 100644
--- a/branches/sca-equinox/samples/feed-aggregator/feed-aggregator.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/feed-aggregator.png
diff --git a/branches/sca-equinox/samples/feed-aggregator/feed-aggregator.svg b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/feed-aggregator.svg
index 72fe6a00ac..72fe6a00ac 100644
--- a/branches/sca-equinox/samples/feed-aggregator/feed-aggregator.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/feed-aggregator.svg
diff --git a/branches/sca-equinox/samples/feed-aggregator/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/pom.xml
index 14190e0d17..14190e0d17 100644
--- a/branches/sca-equinox/samples/feed-aggregator/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/pom.xml
diff --git a/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
index 70e05b3bb3..70e05b3bb3 100644
--- a/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
diff --git a/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/Sort.java b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/Sort.java
index dec073c36b..dec073c36b 100644
--- a/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/Sort.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/Sort.java
diff --git a/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/SortImpl.java b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/SortImpl.java
index f7ead126a7..f7ead126a7 100644
--- a/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/SortImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/main/java/feed/SortImpl.java
diff --git a/branches/sca-equinox/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java
index 1c549f7cd2..1c549f7cd2 100644
--- a/branches/sca-equinox/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java
diff --git a/branches/sca-equinox/samples/feed-aggregator/src/main/resources/FeedAggregator.composite b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
index 8a3a53b4d5..8a3a53b4d5 100644
--- a/branches/sca-equinox/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
diff --git a/branches/sca-equinox/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTest.java b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTest.java
index 9fdfe711be..9fdfe711be 100644
--- a/branches/sca-equinox/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTest.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTest.java
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/README
index 5c669f5da5..5c669f5da5 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/README
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/build.xml
index c8917007f1..c8917007f1 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/helloworld-bpel.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/helloworld-bpel.png
index 5f53a3c5d1..5f53a3c5d1 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/helloworld-bpel.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/helloworld-bpel.png
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/helloworld-bpel.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/helloworld-bpel.svg
index 5a98f1a07c..5a98f1a07c 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/helloworld-bpel.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/helloworld-bpel.svg
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/pom.xml
index b379f18e0c..b379f18e0c 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/java/helloworld/BPELClient.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/java/helloworld/BPELClient.java
index 971a5373e9..971a5373e9 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/java/helloworld/BPELClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/java/helloworld/BPELClient.java
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/deploy.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/deploy.xml
index d9d4363832..d9d4363832 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/deploy.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/deploy.xml
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.bpel b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.bpel
index a88aa7960c..a88aa7960c 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.bpel
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.bpel
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.componentType b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.componentType
index 70273245d7..70273245d7 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.componentType
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.componentType
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.composite
index 97262109e6..97262109e6 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.composite
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.wsdl
index 1cb338b283..1cb338b283 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/log4j.properties b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/log4j.properties
index c1bc0a0b81..c1bc0a0b81 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/log4j.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/main/resources/log4j.properties
diff --git a/branches/sca-equinox/samples/helloworld-bpel-ws/src/test/java/helloworld/BPELHelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/test/java/helloworld/BPELHelloWorldTestCase.java
index 6ad63f87d9..6ad63f87d9 100644
--- a/branches/sca-equinox/samples/helloworld-bpel-ws/src/test/java/helloworld/BPELHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel-ws/src/test/java/helloworld/BPELHelloWorldTestCase.java
diff --git a/branches/sca-equinox/samples/helloworld-bpel/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/README
index bf5f500ef3..bf5f500ef3 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/README
diff --git a/branches/sca-equinox/samples/helloworld-bpel/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/build.xml
index 890a6427b8..890a6427b8 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-bpel/helloworld-bpel.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/helloworld-bpel.png
index 5f53a3c5d1..5f53a3c5d1 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/helloworld-bpel.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/helloworld-bpel.png
diff --git a/branches/sca-equinox/samples/helloworld-bpel/helloworld-bpel.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/helloworld-bpel.svg
index 5a98f1a07c..5a98f1a07c 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/helloworld-bpel.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/helloworld-bpel.svg
diff --git a/branches/sca-equinox/samples/helloworld-bpel/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/pom.xml
index 8c5faa42fd..8c5faa42fd 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
index 1826c885c4..1826c885c4 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
diff --git a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/deploy.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/deploy.xml
index 9bd95b2c58..9bd95b2c58 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/deploy.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/deploy.xml
diff --git a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.bpel b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.bpel
index a88aa7960c..a88aa7960c 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.bpel
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.bpel
diff --git a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.componentType b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.componentType
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.componentType
diff --git a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.composite
diff --git a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/log4j.properties b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/log4j.properties
index 8649a71550..8649a71550 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/log4j.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/main/resources/log4j.properties
diff --git a/branches/sca-equinox/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
index 1caaa78878..1caaa78878 100644
--- a/branches/sca-equinox/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/README
index 38392a13b6..38392a13b6 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/README
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/build-dojo.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/build-dojo.xml
index 534a1dacd9..534a1dacd9 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/build-dojo.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/build-dojo.xml
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/build.xml
index 95813af65a..95813af65a 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
index d5c3bc5d3e..d5c3bc5d3e 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml
index b31df2701d..b31df2701d 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
index 3d8ea24f04..3d8ea24f04 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
index e205f4da9b..e205f4da9b 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
index e895ab455d..e895ab455d 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
index 4195f3288c..4195f3288c 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 2c178c1ddc..2c178c1ddc 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
index 70cd67890a..70cd67890a 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/style.css b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/style.css
index 1071583264..1071583264 100644
--- a/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/style.css
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-dojo-webapp/src/main/webapp/style.css
diff --git a/branches/sca-equinox/samples/helloworld-jms-webapp/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/README
index 9be2e0b0f6..9be2e0b0f6 100644
--- a/branches/sca-equinox/samples/helloworld-jms-webapp/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/README
diff --git a/branches/sca-equinox/samples/helloworld-jms-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/pom.xml
index a94903da21..a94903da21 100644
--- a/branches/sca-equinox/samples/helloworld-jms-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
index c24a741ee2..c24a741ee2 100644
--- a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
index 2af978b9ce..2af978b9ce 100644
--- a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
index 280388f443..280388f443 100644
--- a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
index 2419887413..2419887413 100644
--- a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
diff --git a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
index f6328d156c..f6328d156c 100644
--- a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
diff --git a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
index 86710435ae..86710435ae 100644
--- a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
index bc6ef59a9b..bc6ef59a9b 100644
--- a/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/README
index 07253d039b..07253d039b 100644
--- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/README
diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
index 6ef1f438fb..6ef1f438fb 100644
--- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml
index 49fbca6e06..49fbca6e06 100644
--- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
index 3d8ea24f04..3d8ea24f04 100644
--- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
index 35fd00fabd..35fd00fabd 100644
--- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
index e895ab455d..e895ab455d 100644
--- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
index 75dd9050fa..75dd9050fa 100644
--- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
index c8246e15a7..c8246e15a7 100644
--- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
index 267bed176c..267bed176c 100644
--- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
index 1071583264..1071583264 100644
--- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/README
index 184e67a239..184e67a239 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/README
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/build.xml
index 4702beed0d..4702beed0d 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/helloworld-reference.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/helloworld-reference.png
index ab80b1f91c..ab80b1f91c 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/helloworld-reference.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/helloworld-reference.png
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/helloworld-reference.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/helloworld-reference.svg
index 40f4e8f271..40f4e8f271 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/helloworld-reference.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/helloworld-reference.svg
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/pom.xml
index 10d353d718..10d353d718 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
index 5bec27a137..5bec27a137 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
index c0259c6e07..c0259c6e07 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
index 27cef47677..27cef47677 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
index 3cf1104562..3cf1104562 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
index e692ef8e4c..e692ef8e4c 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/logging.properties b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/logging.properties
index a2a4067921..a2a4067921 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/logging.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/logging.properties
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
index e0ea596dd3..e0ea596dd3 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
index f5380d9ccd..f5380d9ccd 100644
--- a/branches/sca-equinox/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/README
index 49feabaa07..49feabaa07 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/README
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/build.xml
index 330de7f7e5..330de7f7e5 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/helloworld-service.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/helloworld-service.png
index ef27c71f54..ef27c71f54 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/helloworld-service.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/helloworld-service.png
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/helloworld-service.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/helloworld-service.svg
index dd7a9dd87d..dd7a9dd87d 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/helloworld-service.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/helloworld-service.svg
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/pom.xml
index b9cabf8f4a..b9cabf8f4a 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
index d4ea391a00..d4ea391a00 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
index 4b019b21bf..4b019b21bf 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/definitions.xml
index 8c881ab0bb..8c881ab0bb 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
index 3135cdc320..3135cdc320 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
index 3f9e00689e..3f9e00689e 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
index 7930f98716..7930f98716 100644
--- a/branches/sca-equinox/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/README
index abf10ef1f2..abf10ef1f2 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/README
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/build.xml
index 4f83c8ae9d..4f83c8ae9d 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
index 333ad53e0a..333ad53e0a 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/pom.xml
index 567d0f2fa3..567d0f2fa3 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
index b3db243a1f..b3db243a1f 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
index db0c947cf7..db0c947cf7 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
index 0dee19550b..0dee19550b 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
index d029ba3e1c..d029ba3e1c 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
index a4eb217310..a4eb217310 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
index 12b0716b5d..12b0716b5d 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/README
index 13c89ab2f6..13c89ab2f6 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/README
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg
index 354ffbae8f..354ffbae8f 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/pom.xml
index fe9fcaeda8..fe9fcaeda8 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java
index f8d66876fa..f8d66876fa 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java
index 13a31b6391..13a31b6391 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java
index 6d1722095b..6d1722095b 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java
index 3def5194a5..3def5194a5 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java
index 7c1853566f..7c1853566f 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java
index db0c947cf7..db0c947cf7 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite
index 991e4b4881..991e4b4881 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite
index 6ea14602b3..6ea14602b3 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite
index 3d6364f55f..3d6364f55f 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite
index 106e9db988..106e9db988 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite
index bbac4c3703..bbac4c3703 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl
index 662c9affac..662c9affac 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java
index 51b70f47c2..51b70f47c2 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java
index 8226ec884e..8226ec884e 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/README
index 167991c8f7..167991c8f7 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/README
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/build.xml
index 38f1b7549d..38f1b7549d 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
index 333ad53e0a..333ad53e0a 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/pom.xml
index dcb1e8b297..dcb1e8b297 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
index 0f1ebf46d6..0f1ebf46d6 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
index a21619fc8a..a21619fc8a 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
index c0259c6e07..c0259c6e07 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
index 27cef47677..27cef47677 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index 8b089c7222..8b089c7222 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
index 0ab3a5a9f1..0ab3a5a9f1 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
index 0b4f2399f0..0b4f2399f0 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
index 904befaf60..904befaf60 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
index 3a4b43222d..3a4b43222d 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
index e6fcc6f4a6..e6fcc6f4a6 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
index 848c41d1c7..848c41d1c7 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
index 21f2166560..21f2166560 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/README
index 13c89ab2f6..13c89ab2f6 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/README
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/build.xml
index 71ee66b31e..71ee66b31e 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/helloworld-ws-reference.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/helloworld-ws-reference.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/helloworld-ws-reference.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/helloworld-ws-reference.png
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/helloworld-ws-reference.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/helloworld-ws-reference.svg
index 354ffbae8f..354ffbae8f 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/helloworld-ws-reference.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/helloworld-ws-reference.svg
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/pom.xml
index 94cd22e66d..94cd22e66d 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
index 4559b282fe..4559b282fe 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
index db0c947cf7..db0c947cf7 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
index 0dee19550b..0dee19550b 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
index 899ad5ce35..899ad5ce35 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/logging.properties b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/logging.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/logging.properties
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
index 662c9affac..662c9affac 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
index 7ce89179c2..7ce89179c2 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
index 8226ec884e..8226ec884e 100644
--- a/branches/sca-equinox/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/README
index aa4819927a..aa4819927a 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/README
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/build.xml
index 386008e707..386008e707 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
index 2590f02a45..2590f02a45 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
index 56a29db23c..56a29db23c 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml
index 5610504002..5610504002 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
index eb82418516..eb82418516 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
index fea4e2a16c..fea4e2a16c 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
index 3d6576aca0..3d6576aca0 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
index 34396b1b02..34396b1b02 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
index fe79094b94..fe79094b94 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
index a0b7c37cd9..a0b7c37cd9 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
index 4657c6cdc1..4657c6cdc1 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 6f241cc90c..6f241cc90c 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index c2f416eac9..c2f416eac9 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
index 257e65aad4..257e65aad4 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/README
index be947b1923..be947b1923 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/README
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/build.xml
index 401315d424..401315d424 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/helloworld-ws-sdo.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
index 333ad53e0a..333ad53e0a 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/pom.xml
index e78e78b4b8..e78e78b4b8 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
index de4795ceaf..de4795ceaf 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
index c950f7df04..c950f7df04 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
index 367c5b4a12..367c5b4a12 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
index 711eef63b5..711eef63b5 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
index c255df2897..c255df2897 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
index d4fba548d5..d4fba548d5 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/logging.properties b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/logging.properties
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/logging.properties
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
index 2ecc0bea43..2ecc0bea43 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
index 11564c370f..11564c370f 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
index 4b0c40dafd..4b0c40dafd 100644
--- a/branches/sca-equinox/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/README
index 26272b1d91..26272b1d91 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/README
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/build.xml
index 330de7f7e5..330de7f7e5 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/helloworld-ws-service.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/helloworld-ws-service.png
index eab29d0bcd..eab29d0bcd 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/helloworld-ws-service.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/helloworld-ws-service.png
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/helloworld-ws-service.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
index 8d2ae98c82..8d2ae98c82 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/pom.xml
index b1d58dc677..b1d58dc677 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
index 5454487ff6..5454487ff6 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
index 4b019b21bf..4b019b21bf 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
index 8c881ab0bb..8c881ab0bb 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
index 67079f738e..67079f738e 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
index 10faf374f3..10faf374f3 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
index 3f9e00689e..3f9e00689e 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
index 34f8605d5d..34f8605d5d 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
index 03d566cc17..03d566cc17 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/README
index f32eb08b05..f32eb08b05 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/README
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/build.xml
index 29bbae0173..29bbae0173 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
index 6f7d9dd450..6f7d9dd450 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
index 53eb552923..53eb552923 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/pom.xml
index b6c814ff2c..b6c814ff2c 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
index 3d43290380..3d43290380 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
index 4b019b21bf..4b019b21bf 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
index ded02f09d6..ded02f09d6 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
index 10fa7b8652..10fa7b8652 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
index 0b4f2399f0..0b4f2399f0 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
index d1e18d7929..d1e18d7929 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
index 068229be6f..068229be6f 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
index 4a14afcd9d..4a14afcd9d 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-webapp/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/README
index 66040004f8..66040004f8 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-webapp/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/README
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-webapp/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/build.xml
index 247a398c69..247a398c69 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-webapp/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/pom.xml
index 1feda7a078..1feda7a078 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
index 0b95fbd14f..0b95fbd14f 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
index 114608e4d8..114608e4d8 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 8fa52994a6..8fa52994a6 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
index 3f3c92fa78..3f3c92fa78 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/README b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/README
index 44dc7ab4e8..44dc7ab4e8 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/README
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/build.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/build.xml
index 46678febc3..46678febc3 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/build.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/helloworld-ws-service.png b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/helloworld-ws-service.png
index eab29d0bcd..eab29d0bcd 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service/helloworld-ws-service.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/helloworld-ws-service.png
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/helloworld-ws-service.svg b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/helloworld-ws-service.svg
index 61cd93ead9..61cd93ead9 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service/helloworld-ws-service.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/helloworld-ws-service.svg
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/pom.xml
index a172c251e6..a172c251e6 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/pom.xml
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
index c37bfcda65..c37bfcda65 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
index 7245513b2a..7245513b2a 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
index d767625ae7..d767625ae7 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
index 454763410c..454763410c 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
index 189332be91..189332be91 100644
--- a/branches/sca-equinox/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
diff --git a/branches/sca-equinox/samples/implementation-composite/README b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/README
index 27de00e8ef..27de00e8ef 100644
--- a/branches/sca-equinox/samples/implementation-composite/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/README
diff --git a/branches/sca-equinox/samples/implementation-composite/build.xml b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/build.xml
index 7aa31aab8b..7aa31aab8b 100644
--- a/branches/sca-equinox/samples/implementation-composite/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/build.xml
diff --git a/branches/sca-equinox/samples/implementation-composite/implementation-composite.png b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/implementation-composite.png
index 4c6d71bc03..4c6d71bc03 100644
--- a/branches/sca-equinox/samples/implementation-composite/implementation-composite.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/implementation-composite.png
diff --git a/branches/sca-equinox/samples/implementation-composite/implementation-composite.svg b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/implementation-composite.svg
index 0e60354aab..0e60354aab 100644
--- a/branches/sca-equinox/samples/implementation-composite/implementation-composite.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/implementation-composite.svg
diff --git a/branches/sca-equinox/samples/implementation-composite/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/pom.xml
index 27b9f36f3c..27b9f36f3c 100644
--- a/branches/sca-equinox/samples/implementation-composite/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/pom.xml
diff --git a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/CompositeClient.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/CompositeClient.java
index bf743e1797..bf743e1797 100644
--- a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/CompositeClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/CompositeClient.java
diff --git a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/Source.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/Source.java
index d0efcc1df1..d0efcc1df1 100644
--- a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/Source.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/Source.java
diff --git a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/SourceCallback.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/SourceCallback.java
index baa95a8e39..baa95a8e39 100644
--- a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/SourceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/SourceCallback.java
diff --git a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/SourceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/SourceImpl.java
index b9a0c7ff74..b9a0c7ff74 100644
--- a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/SourceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/SourceImpl.java
diff --git a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/Target.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/Target.java
index 9a8f68a7fa..9a8f68a7fa 100644
--- a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/Target.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/Target.java
diff --git a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/TargetImpl.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/TargetImpl.java
index 86686e9233..86686e9233 100644
--- a/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/TargetImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/java/composite/TargetImpl.java
diff --git a/branches/sca-equinox/samples/implementation-composite/src/main/resources/InnerComposite.composite b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/resources/InnerComposite.composite
index 3376ac8ff5..3376ac8ff5 100644
--- a/branches/sca-equinox/samples/implementation-composite/src/main/resources/InnerComposite.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/resources/InnerComposite.composite
diff --git a/branches/sca-equinox/samples/implementation-composite/src/main/resources/InnerComposite2.composite b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/resources/InnerComposite2.composite
index c9eff4fa9d..c9eff4fa9d 100644
--- a/branches/sca-equinox/samples/implementation-composite/src/main/resources/InnerComposite2.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/resources/InnerComposite2.composite
diff --git a/branches/sca-equinox/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
index e675fd3624..e675fd3624 100644
--- a/branches/sca-equinox/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/implementation-composite/src/main/resources/OuterComposite.composite b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/resources/OuterComposite.composite
index cb1c1e13d4..cb1c1e13d4 100644
--- a/branches/sca-equinox/samples/implementation-composite/src/main/resources/OuterComposite.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/main/resources/OuterComposite.composite
diff --git a/branches/sca-equinox/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
index 9e9a4b44a4..9e9a4b44a4 100644
--- a/branches/sca-equinox/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/README b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/README
index 5e8190648f..5e8190648f 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/README
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/build.xml b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/build.xml
index 88d308e6fc..88d308e6fc 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/build.xml
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/pom.xml
index 1ed85d5c95..1ed85d5c95 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/pom.xml
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUD.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
index b23d85887b..b23d85887b 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
index 49be844f93..49be844f93 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
index fa83c63c1b..fa83c63c1b 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
index cc0795a735..cc0795a735 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
index a7908501a1..a7908501a1 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
index 383a035e69..383a035e69 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
index b212ee3c9b..b212ee3c9b 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
index 8f11f9d910..8f11f9d910 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
index 4566cb7155..4566cb7155 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
index 3cf5de5fa1..3cf5de5fa1 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 17c98cf706..17c98cf706 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 527c626418..527c626418 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 6ce605197a..6ce605197a 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
index 447e31bf93..447e31bf93 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
index 0bb5cfc361..0bb5cfc361 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
diff --git a/branches/sca-equinox/samples/implementation-crud-extension/src/test/resources/crud.composite b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/test/resources/crud.composite
index 18745033bb..18745033bb 100644
--- a/branches/sca-equinox/samples/implementation-crud-extension/src/test/resources/crud.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud-extension/src/test/resources/crud.composite
diff --git a/branches/sca-equinox/samples/implementation-crud/README b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/README
index 50da631c04..50da631c04 100644
--- a/branches/sca-equinox/samples/implementation-crud/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/README
diff --git a/branches/sca-equinox/samples/implementation-crud/build.xml b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/build.xml
index 10b26b5a94..10b26b5a94 100644
--- a/branches/sca-equinox/samples/implementation-crud/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/build.xml
diff --git a/branches/sca-equinox/samples/implementation-crud/implementation-crud.png b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/implementation-crud.png
index a292037e7a..a292037e7a 100644
--- a/branches/sca-equinox/samples/implementation-crud/implementation-crud.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/implementation-crud.png
diff --git a/branches/sca-equinox/samples/implementation-crud/implementation-crud.svg b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/implementation-crud.svg
index dbb37be208..dbb37be208 100644
--- a/branches/sca-equinox/samples/implementation-crud/implementation-crud.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/implementation-crud.svg
diff --git a/branches/sca-equinox/samples/implementation-crud/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/pom.xml
index ce3f1c5232..ce3f1c5232 100644
--- a/branches/sca-equinox/samples/implementation-crud/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/pom.xml
diff --git a/branches/sca-equinox/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
index ea87cb3001..ea87cb3001 100644
--- a/branches/sca-equinox/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
diff --git a/branches/sca-equinox/samples/implementation-crud/src/main/resources/crud.composite b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/src/main/resources/crud.composite
index 18745033bb..18745033bb 100644
--- a/branches/sca-equinox/samples/implementation-crud/src/main/resources/crud.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/src/main/resources/crud.composite
diff --git a/branches/sca-equinox/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
index 7e0476a8b1..7e0476a8b1 100644
--- a/branches/sca-equinox/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/README b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/README
index 3b201779e1..3b201779e1 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/README
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/build.xml b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/build.xml
index 78bae79859..78bae79859 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/build.xml
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/pom.xml
index 3134c26a34..3134c26a34 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/pom.xml
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
index 7c2f5d236f..7c2f5d236f 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
index bbcfb3d0dc..bbcfb3d0dc 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
index 0dad270a6c..0dad270a6c 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
index f2d6871039..f2d6871039 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
index 1c5868b674..1c5868b674 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
index 87333c61f6..87333c61f6 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
index 73a0d22493..73a0d22493 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
index 22f2be09e9..22f2be09e9 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 8337e81c5f..8337e81c5f 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 64dd230a15..64dd230a15 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index b30ea3b9cf..b30ea3b9cf 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
index 075af98240..075af98240 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
index c9d170770b..c9d170770b 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
index cc32929f09..cc32929f09 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
index 0580e30aba..0580e30aba 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
index 69ab1f567e..69ab1f567e 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
index d8b5f41adc..d8b5f41adc 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
index a92c5ab8db..a92c5ab8db 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
index c38094dfc9..c38094dfc9 100644
--- a/branches/sca-equinox/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-equinox/samples/loanapplication/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/pom.xml
index c8614b44a4..c8614b44a4 100644
--- a/branches/sca-equinox/samples/loanapplication/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/pom.xml
diff --git a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
index 4fedb70782..4fedb70782 100644
--- a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
diff --git a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
index 5183ece867..5183ece867 100644
--- a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
diff --git a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanClient.java b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
index 7e4438bbff..7e4438bbff 100644
--- a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
diff --git a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
index b06d9465a2..b06d9465a2 100644
--- a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
diff --git a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanService.java b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanService.java
index 9dfd8b42fe..9dfd8b42fe 100644
--- a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanService.java
diff --git a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
index 76a53323bd..76a53323bd 100644
--- a/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
diff --git a/branches/sca-equinox/samples/loanapplication/src/main/resources/loanapplication.composite b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/resources/loanapplication.composite
index 3aa8d030b7..3aa8d030b7 100644
--- a/branches/sca-equinox/samples/loanapplication/src/main/resources/loanapplication.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/main/resources/loanapplication.composite
diff --git a/branches/sca-equinox/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
index e88e48a53a..e88e48a53a 100644
--- a/branches/sca-equinox/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/README b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/README
index 11fecf2ae8..11fecf2ae8 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/README
diff --git a/branches/sca-equinox/samples/osgi-supplychain/build-bundles.xml b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/build-bundles.xml
index 7a31e6016b..7a31e6016b 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/build-bundles.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/build-bundles.xml
diff --git a/branches/sca-equinox/samples/osgi-supplychain/build.xml b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/build.xml
index 2e103e5a15..2e103e5a15 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/build.xml
diff --git a/branches/sca-equinox/samples/osgi-supplychain/osgi-supplychain.png b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/osgi-supplychain.png
index 2bec57ac8a..2bec57ac8a 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/osgi-supplychain.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/osgi-supplychain.png
diff --git a/branches/sca-equinox/samples/osgi-supplychain/osgi-supplychain.svg b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/osgi-supplychain.svg
index 43cb427944..43cb427944 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/osgi-supplychain.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/osgi-supplychain.svg
diff --git a/branches/sca-equinox/samples/osgi-supplychain/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/pom.xml
index 27dd87a1fb..27dd87a1fb 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/pom.xml
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
index 5f40054ada..5f40054ada 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
index 64814487cb..64814487cb 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
index 225dce0236..225dce0236 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 023d716651..023d716651 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a1c7fce60a..a1c7fce60a 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 4647a716c7..4647a716c7 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index d0d29f94f8..d0d29f94f8 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index 1b7fb15bf1..1b7fb15bf1 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e97331c06c..e97331c06c 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 4206ce7dc8..4206ce7dc8 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index 0f88cca213..0f88cca213 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index f55a068ede..f55a068ede 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index 72eec76cc2..72eec76cc2 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 600f3f0c74..600f3f0c74 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index b8bca97bd0..b8bca97bd0 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Customer.componentType b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Customer.componentType
index 5c61a0961c..5c61a0961c 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Customer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Customer.componentType
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
index 87a184d968..87a184d968 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
index 872ab6601a..872ab6601a 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSShipper.componentType b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
index 57fcbbc5d1..57fcbbc5d1 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
index 75fa8029f7..75fa8029f7 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Retailer.componentType b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Retailer.componentType
index 15185f2bf9..15185f2bf9 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Retailer.componentType
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Retailer.componentType
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Shipper.componentType b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Shipper.componentType
index 675597d80b..675597d80b 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Shipper.componentType
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Shipper.componentType
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Warehouse.componentType b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
index 6e1ac3e5a9..6e1ac3e5a9 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
index 88d79e5219..88d79e5219 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
index d95ef5d582..d95ef5d582 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
index de7ac7ec7a..de7ac7ec7a 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
index 21241a6899..21241a6899 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
index b5c5a862be..b5c5a862be 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
index 5b368afd5b..5b368afd5b 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
index 47897d16ca..47897d16ca 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
index cae7fdfde2..cae7fdfde2 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
index f5333c7caa..f5333c7caa 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
index d894309b71..d894309b71 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
index 6166549e5a..6166549e5a 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
index fc86a76784..fc86a76784 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/supplychain.composite b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/supplychain.composite
index 0bbfed9176..0bbfed9176 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/supplychain.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/supplychain.composite
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
index d1e11168e2..d1e11168e2 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
diff --git a/branches/sca-equinox/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
index ff15c0d9a2..ff15c0d9a2 100644
--- a/branches/sca-equinox/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
diff --git a/branches/sca-equinox/samples/photo-gallery/README b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/README
index c66edea985..c66edea985 100644
--- a/branches/sca-equinox/samples/photo-gallery/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/README
diff --git a/branches/sca-equinox/samples/photo-gallery/build.xml b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/build.xml
index 652afc3570..652afc3570 100644
--- a/branches/sca-equinox/samples/photo-gallery/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/build.xml
diff --git a/branches/sca-equinox/samples/photo-gallery/photo-gallery.png b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/photo-gallery.png
index da413edeee..da413edeee 100644
--- a/branches/sca-equinox/samples/photo-gallery/photo-gallery.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/photo-gallery.png
diff --git a/branches/sca-equinox/samples/photo-gallery/photo-gallery.svg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/photo-gallery.svg
index 74f8ecd36d..74f8ecd36d 100644
--- a/branches/sca-equinox/samples/photo-gallery/photo-gallery.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/photo-gallery.svg
diff --git a/branches/sca-equinox/samples/photo-gallery/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/pom.xml
index 1f8ebbcc09..1f8ebbcc09 100644
--- a/branches/sca-equinox/samples/photo-gallery/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/pom.xml
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/java/launch/LaunchGallery.java b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
index 1007cd49b0..1007cd49b0 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java
index d07dc63592..d07dc63592 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/java/services/Album.java b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/java/services/Album.java
index 5257d0e703..5257d0e703 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/java/services/Album.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/java/services/Album.java
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/java/services/AlbumImpl.java b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/java/services/AlbumImpl.java
index dd2b086e29..dd2b086e29 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/java/services/AlbumImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/java/services/AlbumImpl.java
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
index ac4e6f52f4..ac4e6f52f4 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery.html b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery.html
index f6566e88ec..f6566e88ec 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery.html
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery.html
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg
index 9437b321e2..9437b321e2 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg
index 07f37ec505..07f37ec505 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg
index 2193784271..2193784271 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg
index 1532ee2c1b..1532ee2c1b 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg
index 17ffd73aec..17ffd73aec 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg
index 19e9ec37df..19e9ec37df 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg
index 022416dbce..022416dbce 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg
index c78a974714..c78a974714 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg
index a98070925a..a98070925a 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg
index dc83889116..dc83889116 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg
index 0e33548135..0e33548135 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/index.gif b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/index.gif
index 7599ac7686..7599ac7686 100755
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/index.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/index.gif
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/index_on.gif b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/index_on.gif
index 153e9879d6..153e9879d6 100755
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/index_on.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/index_on.gif
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/next.gif b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/next.gif
index 002eaf6951..002eaf6951 100755
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/next.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/next.gif
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/next_disabled.gif b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/next_disabled.gif
index 38b1298453..38b1298453 100755
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/next_disabled.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/next_disabled.gif
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/next_on.gif b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/next_on.gif
index 4e5bb3e7ef..4e5bb3e7ef 100755
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/next_on.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/next_on.gif
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
index 23190de555..23190de555 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/photo-gallery.composite b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/photo-gallery.composite
index 0bb3c4b4db..0bb3c4b4db 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/photo-gallery.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/photo-gallery.composite
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev.gif b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev.gif
index 4eea10f1dc..4eea10f1dc 100755
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev.gif
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev_disabled.gif b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev_disabled.gif
index 7e35f07076..7e35f07076 100755
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev_disabled.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev_disabled.gif
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev_on.gif b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev_on.gif
index 3ef9a776bb..3ef9a776bb 100755
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev_on.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/prev_on.gif
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/show_slide.gif b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/show_slide.gif
index a5b6a15c2b..a5b6a15c2b 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/show_slide.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/show_slide.gif
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/space.gif b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/space.gif
index 170fe82b65..170fe82b65 100644
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/space.gif
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/space.gif
diff --git a/branches/sca-equinox/samples/photo-gallery/src/main/resources/styles.css b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/styles.css
index d23d949858..d23d949858 100755
--- a/branches/sca-equinox/samples/photo-gallery/src/main/resources/styles.css
+++ b/sca-java-2.x/branches/sca-equinox/samples/photo-gallery/src/main/resources/styles.css
diff --git a/branches/sca-equinox/samples/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/pom.xml
index aec37555d3..aec37555d3 100644
--- a/branches/sca-equinox/samples/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/pom.xml
diff --git a/branches/sca-equinox/samples/quote-xquery/README b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/README
index cf8a4609a6..cf8a4609a6 100644
--- a/branches/sca-equinox/samples/quote-xquery/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/README
diff --git a/branches/sca-equinox/samples/quote-xquery/build.xml b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/build.xml
index a3a5acf102..a3a5acf102 100644
--- a/branches/sca-equinox/samples/quote-xquery/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/build.xml
diff --git a/branches/sca-equinox/samples/quote-xquery/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/pom.xml
index 4e007df2b8..4e007df2b8 100644
--- a/branches/sca-equinox/samples/quote-xquery/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/pom.xml
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
index 8a42136b5d..8a42136b5d 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
index 41d78683cc..41d78683cc 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
index f744a59744..f744a59744 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
index 374c0825e9..374c0825e9 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
index fbe38b8269..fbe38b8269 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
index d2d175430b..d2d175430b 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
index 06c3945a6e..06c3945a6e 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
index 1ecdf120c2..1ecdf120c2 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
index 85508eaa46..85508eaa46 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
index 26331381a8..26331381a8 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
index 8ed02dc1ef..8ed02dc1ef 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
index 425867055b..425867055b 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
index cfd201f883..cfd201f883 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
index 20fe73fd92..20fe73fd92 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
index adc852acd4..adc852acd4 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
index 3fa3cdb637..3fa3cdb637 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
index d504f40f04..d504f40f04 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
index cc50da164a..cc50da164a 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
index cf41ab528d..cf41ab528d 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
index e7f3e67068..e7f3e67068 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
index 4c437586ef..4c437586ef 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
index 4f64850056..4f64850056 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
index 96c2af138a..96c2af138a 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/resources/xqueryquotews.composite b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/xqueryquotews.composite
index 9e35e2ecb2..9e35e2ecb2 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/resources/xqueryquotews.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/xqueryquotews.composite
diff --git a/branches/sca-equinox/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
index 35306b9f89..35306b9f89 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
diff --git a/branches/sca-equinox/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
index 9555532b3e..9555532b3e 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
diff --git a/branches/sca-equinox/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
index 9a4be5bda6..9a4be5bda6 100644
--- a/branches/sca-equinox/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/README b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/README
index bb44d63719..bb44d63719 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/README
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/build-dojo.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/build-dojo.xml
index 9d282c2dd2..9d282c2dd2 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/build-dojo.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/build-dojo.xml
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/build.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/build.xml
index ecc2596d71..ecc2596d71 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/build.xml
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/pom.xml
index 0f243282c2..0f243282c2 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/pom.xml
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/simple-bigbank-spring.png b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/simple-bigbank-spring.png
index 593c047f6a..593c047f6a 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/simple-bigbank-spring.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/simple-bigbank-spring.png
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/simple-bigbank-spring.svg b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/simple-bigbank-spring.svg
index c64f6de6b9..c64f6de6b9 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/simple-bigbank-spring.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/simple-bigbank-spring.svg
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
index 1625ff5b65..1625ff5b65 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
index 7c9082b944..7c9082b944 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
index ce41006fa6..ce41006fa6 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
index 3f81f48fb9..3f81f48fb9 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java
index 2b52909bc1..2b52909bc1 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java
index 386f7bb90d..386f7bb90d 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
index bcac678cd7..bcac678cd7 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java
index 8a012c12f9..8a012c12f9 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
index 980ec1c335..980ec1c335 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java
index 9f06a71bae..9f06a71bae 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java
index 1ee386ba90..1ee386ba90 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
index 61aea6869e..61aea6869e 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java
index 66a0ba0e63..66a0ba0e63 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
index fe3b198a7b..fe3b198a7b 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
index 82103612f7..82103612f7 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
index 2d97b57066..2d97b57066 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/BigBank.composite b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
index 46c0ec793d..46c0ec793d 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite
index 4bb2ce61ef..4bb2ce61ef 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite
index 97dff499ba..97dff499ba 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
index 899d8d7d62..899d8d7d62 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml
index b9e26bf81b..b9e26bf81b 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF
index 32fa070ffb..32fa070ffb 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml
index b30f821f7e..b30f821f7e 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/web/style.css b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/web/style.css
index 1071583264..1071583264 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/web/style.css
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/main/resources/web/style.css
diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
index d82e383e46..d82e383e46 100644
--- a/branches/sca-equinox/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/README b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/README
index acbe93a4d3..acbe93a4d3 100644
--- a/branches/sca-equinox/samples/simple-bigbank/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/README
diff --git a/branches/sca-equinox/samples/simple-bigbank/build.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/build.xml
index a814014eae..a814014eae 100644
--- a/branches/sca-equinox/samples/simple-bigbank/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/build.xml
diff --git a/branches/sca-equinox/samples/simple-bigbank/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/pom.xml
index d9c20abbcf..d9c20abbcf 100644
--- a/branches/sca-equinox/samples/simple-bigbank/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/pom.xml
diff --git a/branches/sca-equinox/samples/simple-bigbank/simple-bigbank.png b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/simple-bigbank.png
index 593c047f6a..593c047f6a 100644
--- a/branches/sca-equinox/samples/simple-bigbank/simple-bigbank.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/simple-bigbank.png
diff --git a/branches/sca-equinox/samples/simple-bigbank/simple-bigbank.svg b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/simple-bigbank.svg
index c64f6de6b9..c64f6de6b9 100644
--- a/branches/sca-equinox/samples/simple-bigbank/simple-bigbank.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/simple-bigbank.svg
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
index 1625ff5b65..1625ff5b65 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
index 7c9082b944..7c9082b944 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
index fa85f309c0..fa85f309c0 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
index a5ae7b3955..a5ae7b3955 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
index c354de387b..c354de387b 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
index 000acb935c..000acb935c 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
index 11bdff757e..11bdff757e 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
index b791024076..b791024076 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
index 86246a3f84..86246a3f84 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
index edbf910d37..edbf910d37 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 0512d40b0b..0512d40b0b 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
index 7961279352..7961279352 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/resources/Account.composite b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/resources/Account.composite
index e71615e27e..e71615e27e 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/resources/Account.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/resources/Account.composite
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/resources/BigBank.composite b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/resources/BigBank.composite
index c870f39cab..c870f39cab 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/resources/BigBank.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/resources/BigBank.composite
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/main/resources/StockQuote.composite b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/resources/StockQuote.composite
index 4f29c14851..4f29c14851 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/main/resources/StockQuote.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/main/resources/StockQuote.composite
diff --git a/branches/sca-equinox/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
index ba6c1dd797..ba6c1dd797 100644
--- a/branches/sca-equinox/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
diff --git a/branches/sca-equinox/samples/simple-callback-ws/README b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/README
index 6b27718f74..6b27718f74 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/README
diff --git a/branches/sca-equinox/samples/simple-callback-ws/build.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/build.xml
index 10b69bd395..10b69bd395 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/build.xml
diff --git a/branches/sca-equinox/samples/simple-callback-ws/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/pom.xml
index da24b7a45d..da24b7a45d 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/pom.xml
diff --git a/branches/sca-equinox/samples/simple-callback-ws/simple-callback-ws.png b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/simple-callback-ws.png
index 1b6353f5cf..1b6353f5cf 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/simple-callback-ws.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/simple-callback-ws.png
diff --git a/branches/sca-equinox/samples/simple-callback-ws/simple-callback-ws.svg b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/simple-callback-ws.svg
index 7d9e3de510..7d9e3de510 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/simple-callback-ws.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/simple-callback-ws.svg
diff --git a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
index 4cc00d6d0f..4cc00d6d0f 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
diff --git a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
index ad7c6d8fef..ad7c6d8fef 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
diff --git a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
index 48acc0e94f..48acc0e94f 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
diff --git a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
index 66cfb2bc8a..66cfb2bc8a 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
diff --git a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
index 08057d2fcc..08057d2fcc 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
diff --git a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
index eeb0e52163..eeb0e52163 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
diff --git a/branches/sca-equinox/samples/simple-callback-ws/src/main/resources/simplecallback.composite b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/resources/simplecallback.composite
index 53e7fe66af..53e7fe66af 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/src/main/resources/simplecallback.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/resources/simplecallback.composite
diff --git a/branches/sca-equinox/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
index 8a6465de3a..8a6465de3a 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
diff --git a/branches/sca-equinox/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
index 580a7f6b0c..580a7f6b0c 100644
--- a/branches/sca-equinox/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
diff --git a/branches/sca-equinox/samples/simple-callback/README b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/README
index 719376f254..719376f254 100644
--- a/branches/sca-equinox/samples/simple-callback/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/README
diff --git a/branches/sca-equinox/samples/simple-callback/build.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/build.xml
index 47d1ea4bc1..47d1ea4bc1 100644
--- a/branches/sca-equinox/samples/simple-callback/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/build.xml
diff --git a/branches/sca-equinox/samples/simple-callback/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/pom.xml
index 98b9c7adbd..98b9c7adbd 100644
--- a/branches/sca-equinox/samples/simple-callback/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/pom.xml
diff --git a/branches/sca-equinox/samples/simple-callback/simple-callback.png b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/simple-callback.png
index 1b6353f5cf..1b6353f5cf 100644
--- a/branches/sca-equinox/samples/simple-callback/simple-callback.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/simple-callback.png
diff --git a/branches/sca-equinox/samples/simple-callback/simple-callback.svg b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/simple-callback.svg
index 484b65df9d..484b65df9d 100644
--- a/branches/sca-equinox/samples/simple-callback/simple-callback.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/simple-callback.svg
diff --git a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyClient.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyClient.java
index 4cc00d6d0f..4cc00d6d0f 100644
--- a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyClient.java
diff --git a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
index 3e2a1df5a5..3e2a1df5a5 100644
--- a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
diff --git a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyService.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyService.java
index e78ad6f68f..e78ad6f68f 100644
--- a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyService.java
diff --git a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
index b27eea44f5..b27eea44f5 100644
--- a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
diff --git a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
index fc5e31d14e..fc5e31d14e 100644
--- a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
diff --git a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
index b8987fcd07..b8987fcd07 100644
--- a/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
diff --git a/branches/sca-equinox/samples/simple-callback/src/main/resources/simplecallback.composite b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/resources/simplecallback.composite
index 33e6f60601..33e6f60601 100644
--- a/branches/sca-equinox/samples/simple-callback/src/main/resources/simplecallback.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/main/resources/simplecallback.composite
diff --git a/branches/sca-equinox/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
index cbaab8af83..cbaab8af83 100644
--- a/branches/sca-equinox/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/README b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/README
index 3869ea6a12..3869ea6a12 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/README
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/build.xml b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/build.xml
index 9d69ee9ba0..9d69ee9ba0 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/build.xml
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/pom.xml
index e65fa45427..e65fa45427 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/pom.xml
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java
index ecaa4e28de..ecaa4e28de 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java
index 66a0ba0e63..66a0ba0e63 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java
index 2a529dddeb..2a529dddeb 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java
index 22e9d58a94..22e9d58a94 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java
index ba3d43448e..ba3d43448e 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java
index 17691af0e8..17691af0e8 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
index 7167edc672..7167edc672 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite
index 0eea510512..0eea510512 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml
index 42e5f824f9..42e5f824f9 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
index 6f11106ddd..6f11106ddd 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
index cfd96f287a..cfd96f287a 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
index 8e7a884d41..8e7a884d41 100644
--- a/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/README b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/README
index 17b71e7590..17b71e7590 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/README
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/build.xml b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/build.xml
index 26d71c146f..26d71c146f 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/build.xml
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/pom.xml
index 4ef6670cf9..4ef6670cf9 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/pom.xml
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
index 9737ac27eb..9737ac27eb 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java
index a8b958010a..a8b958010a 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
index a18a4920b8..a18a4920b8 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
index b6c6d3897d..b6c6d3897d 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
index ad17ab8cf5..ad17ab8cf5 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
index 7b44a28bc9..7b44a28bc9 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
index bbd5b0c325..bbd5b0c325 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
index cb26ca809d..cb26ca809d 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
index 2ebcc8470a..2ebcc8470a 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
index 24da9878a5..24da9878a5 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
index 5668fa23b9..5668fa23b9 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
index d2f9bf80a5..d2f9bf80a5 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite
index 371a1afd32..371a1afd32 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 6491a0d326..6491a0d326 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index b1bce4339d..b1bce4339d 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index d6bfe2167e..d6bfe2167e 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml
index d57d02297c..d57d02297c 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml
index 6b2338f611..6b2338f611 100644
--- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml
diff --git a/branches/sca-equinox/samples/spring-bigbank-stockquote/README b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/README
index b90bafeb59..b90bafeb59 100644
--- a/branches/sca-equinox/samples/spring-bigbank-stockquote/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/README
diff --git a/branches/sca-equinox/samples/spring-bigbank-stockquote/build.xml b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/build.xml
index 1b38a40495..1b38a40495 100644
--- a/branches/sca-equinox/samples/spring-bigbank-stockquote/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/build.xml
diff --git a/branches/sca-equinox/samples/spring-bigbank-stockquote/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/pom.xml
index 72a2b8f379..72a2b8f379 100644
--- a/branches/sca-equinox/samples/spring-bigbank-stockquote/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/pom.xml
diff --git a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 81c47a78d1..81c47a78d1 100644
--- a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java
index d4b3fe9035..d4b3fe9035 100644
--- a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java
index 643f9a187c..643f9a187c 100644
--- a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java
index 1fe6b2d516..1fe6b2d516 100644
--- a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java
diff --git a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml
index 87dd006b5a..87dd006b5a 100644
--- a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml
diff --git a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite
index 06544c6883..06544c6883 100644
--- a/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite
diff --git a/branches/sca-equinox/samples/store-distributed/README b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/README
index 46e71bf51e..46e71bf51e 100644
--- a/branches/sca-equinox/samples/store-distributed/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/README
diff --git a/branches/sca-equinox/samples/store-distributed/build.xml b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/build.xml
index 652afc3570..652afc3570 100644
--- a/branches/sca-equinox/samples/store-distributed/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/build.xml
diff --git a/branches/sca-equinox/samples/store-distributed/cloud.composite b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/cloud.composite
index 7bd13d5b6f..7bd13d5b6f 100644
--- a/branches/sca-equinox/samples/store-distributed/cloud.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/cloud.composite
diff --git a/branches/sca-equinox/samples/store-distributed/domain.composite b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/domain.composite
index 6898c454af..6898c454af 100644
--- a/branches/sca-equinox/samples/store-distributed/domain.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/domain.composite
diff --git a/branches/sca-equinox/samples/store-distributed/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/pom.xml
index 50ca6ba9b1..50ca6ba9b1 100644
--- a/branches/sca-equinox/samples/store-distributed/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/pom.xml
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchDomain.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchDomain.java
index dd19f6b49b..dd19f6b49b 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchDomain.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchDomain.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java
index 9016e515fb..9016e515fb 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java
index 2b387aec82..2b387aec82 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java
index fb138e484f..fb138e484f 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/services/Cart.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/Cart.java
index 9e6226d963..9e6226d963 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/services/Cart.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/Cart.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/services/Catalog.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/Catalog.java
index 2c3b19f579..2c3b19f579 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/services/Catalog.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/Catalog.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/services/CurrencyConverter.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/CurrencyConverter.java
index e104a0423a..e104a0423a 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/services/CurrencyConverter.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/CurrencyConverter.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java
index c354aed447..c354aed447 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java
index 377b3d7e59..377b3d7e59 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/services/Item.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/Item.java
index 27abd4f016..27abd4f016 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/services/Item.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/Item.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java
index 9889921a96..9889921a96 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/java/services/Total.java b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/Total.java
index 8f464e526f..8f464e526f 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/java/services/Total.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/java/services/Total.java
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeA.composite b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeA.composite
index f7bfd0fcb6..f7bfd0fcb6 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeA.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeA.composite
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeB.composite b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeB.composite
index 187c5caf1c..187c5caf1c 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeB.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeB.composite
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeC.composite b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeC.composite
index 98113a3576..98113a3576 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeC.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/cloud/NodeC.composite
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
index f165ee0e29..f165ee0e29 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeA/store.composite b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeA/store.composite
index 2ac608d43f..2ac608d43f 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeA/store.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeA/store.composite
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 0f8e76ccd7..0f8e76ccd7 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeB/store.composite b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeB/store.composite
index 062a7aa2cd..062a7aa2cd 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeB/store.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeB/store.composite
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
index 15bab17c1a..15bab17c1a 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/store.composite b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/store.composite
index 5de310128d..5de310128d 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/store.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/store.composite
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html
index 45604463d1..45604463d1 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html
diff --git a/branches/sca-equinox/samples/store-distributed/src/main/resources/uiservices/store.html b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/uiservices/store.html
index 45604463d1..45604463d1 100644
--- a/branches/sca-equinox/samples/store-distributed/src/main/resources/uiservices/store.html
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/src/main/resources/uiservices/store.html
diff --git a/branches/sca-equinox/samples/store-distributed/store.png b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/store.png
index da413edeee..da413edeee 100644
--- a/branches/sca-equinox/samples/store-distributed/store.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/store.png
diff --git a/branches/sca-equinox/samples/store-distributed/store.svg b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/store.svg
index 74f8ecd36d..74f8ecd36d 100644
--- a/branches/sca-equinox/samples/store-distributed/store.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/store.svg
diff --git a/branches/sca-equinox/samples/store-distributed/workspace.xml b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/workspace.xml
index d6cb2bfc81..d6cb2bfc81 100644
--- a/branches/sca-equinox/samples/store-distributed/workspace.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/store-distributed/workspace.xml
diff --git a/branches/sca-equinox/samples/store/README b/sca-java-2.x/branches/sca-equinox/samples/store/README
index 46e71bf51e..46e71bf51e 100644
--- a/branches/sca-equinox/samples/store/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/README
diff --git a/branches/sca-equinox/samples/store/build.xml b/sca-java-2.x/branches/sca-equinox/samples/store/build.xml
index 652afc3570..652afc3570 100644
--- a/branches/sca-equinox/samples/store/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/build.xml
diff --git a/branches/sca-equinox/samples/store/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/store/pom.xml
index f833b00147..f833b00147 100644
--- a/branches/sca-equinox/samples/store/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/pom.xml
diff --git a/branches/sca-equinox/samples/store/src/main/java/launch/Launch.java b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/launch/Launch.java
index 801697abea..801697abea 100644
--- a/branches/sca-equinox/samples/store/src/main/java/launch/Launch.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/launch/Launch.java
diff --git a/branches/sca-equinox/samples/store/src/main/java/services/Cart.java b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/Cart.java
index 9e6226d963..9e6226d963 100644
--- a/branches/sca-equinox/samples/store/src/main/java/services/Cart.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/Cart.java
diff --git a/branches/sca-equinox/samples/store/src/main/java/services/Catalog.java b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/Catalog.java
index 2c3b19f579..2c3b19f579 100644
--- a/branches/sca-equinox/samples/store/src/main/java/services/Catalog.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/Catalog.java
diff --git a/branches/sca-equinox/samples/store/src/main/java/services/CurrencyConverter.java b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/CurrencyConverter.java
index e104a0423a..e104a0423a 100644
--- a/branches/sca-equinox/samples/store/src/main/java/services/CurrencyConverter.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/CurrencyConverter.java
diff --git a/branches/sca-equinox/samples/store/src/main/java/services/CurrencyConverterImpl.java b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/CurrencyConverterImpl.java
index c354aed447..c354aed447 100644
--- a/branches/sca-equinox/samples/store/src/main/java/services/CurrencyConverterImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/CurrencyConverterImpl.java
diff --git a/branches/sca-equinox/samples/store/src/main/java/services/FruitsCatalogImpl.java b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/FruitsCatalogImpl.java
index 377b3d7e59..377b3d7e59 100644
--- a/branches/sca-equinox/samples/store/src/main/java/services/FruitsCatalogImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/FruitsCatalogImpl.java
diff --git a/branches/sca-equinox/samples/store/src/main/java/services/Item.java b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/Item.java
index 27abd4f016..27abd4f016 100644
--- a/branches/sca-equinox/samples/store/src/main/java/services/Item.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/Item.java
diff --git a/branches/sca-equinox/samples/store/src/main/java/services/ShoppingCartImpl.java b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/ShoppingCartImpl.java
index 9889921a96..9889921a96 100644
--- a/branches/sca-equinox/samples/store/src/main/java/services/ShoppingCartImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/ShoppingCartImpl.java
diff --git a/branches/sca-equinox/samples/store/src/main/java/services/Total.java b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/Total.java
index 8f464e526f..8f464e526f 100644
--- a/branches/sca-equinox/samples/store/src/main/java/services/Total.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/java/services/Total.java
diff --git a/branches/sca-equinox/samples/store/src/main/resources/store.composite b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/resources/store.composite
index 571678839d..571678839d 100644
--- a/branches/sca-equinox/samples/store/src/main/resources/store.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/resources/store.composite
diff --git a/branches/sca-equinox/samples/store/src/main/resources/uiservices/store.html b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/resources/uiservices/store.html
index 45604463d1..45604463d1 100644
--- a/branches/sca-equinox/samples/store/src/main/resources/uiservices/store.html
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/src/main/resources/uiservices/store.html
diff --git a/branches/sca-equinox/samples/store/store.png b/sca-java-2.x/branches/sca-equinox/samples/store/store.png
index da413edeee..da413edeee 100644
--- a/branches/sca-equinox/samples/store/store.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/store.png
diff --git a/branches/sca-equinox/samples/store/store.svg b/sca-java-2.x/branches/sca-equinox/samples/store/store.svg
index 74f8ecd36d..74f8ecd36d 100644
--- a/branches/sca-equinox/samples/store/store.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/store/store.svg
diff --git a/branches/sca-equinox/samples/supplychain/README b/sca-java-2.x/branches/sca-equinox/samples/supplychain/README
index ea4493fdd4..ea4493fdd4 100644
--- a/branches/sca-equinox/samples/supplychain/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/README
diff --git a/branches/sca-equinox/samples/supplychain/build.xml b/sca-java-2.x/branches/sca-equinox/samples/supplychain/build.xml
index 506180b8b1..506180b8b1 100644
--- a/branches/sca-equinox/samples/supplychain/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/build.xml
diff --git a/branches/sca-equinox/samples/supplychain/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/supplychain/pom.xml
index 4ce8c7ddc1..4ce8c7ddc1 100644
--- a/branches/sca-equinox/samples/supplychain/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/pom.xml
diff --git a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Customer.java b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Customer.java
index 8088001898..8088001898 100644
--- a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Customer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Customer.java
diff --git a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
index 7a1e8553ec..7a1e8553ec 100644
--- a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
diff --git a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Retailer.java b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Retailer.java
index 1add63fb4e..1add63fb4e 100644
--- a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Retailer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Retailer.java
diff --git a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
index f622052cf8..f622052cf8 100644
--- a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
diff --git a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Shipper.java b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Shipper.java
index d4d49a922b..d4d49a922b 100644
--- a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Shipper.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Shipper.java
diff --git a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
index 4ae52a12a2..4ae52a12a2 100644
--- a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
diff --git a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
index 7072f582d1..7072f582d1 100644
--- a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Warehouse.java b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Warehouse.java
index 0be499f569..0be499f569 100644
--- a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Warehouse.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/Warehouse.java
diff --git a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
index b5e256a1e0..b5e256a1e0 100644
--- a/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
diff --git a/branches/sca-equinox/samples/supplychain/src/main/resources/supplychain.composite b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/resources/supplychain.composite
index 301efcaf1f..301efcaf1f 100644
--- a/branches/sca-equinox/samples/supplychain/src/main/resources/supplychain.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/main/resources/supplychain.composite
diff --git a/branches/sca-equinox/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
index 88e0eb7ab8..88e0eb7ab8 100644
--- a/branches/sca-equinox/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
diff --git a/branches/sca-equinox/samples/supplychain/supplychain.png b/sca-java-2.x/branches/sca-equinox/samples/supplychain/supplychain.png
index 51a384e827..51a384e827 100644
--- a/branches/sca-equinox/samples/supplychain/supplychain.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/supplychain.png
diff --git a/branches/sca-equinox/samples/supplychain/supplychain.svg b/sca-java-2.x/branches/sca-equinox/samples/supplychain/supplychain.svg
index f72e77acab..f72e77acab 100644
--- a/branches/sca-equinox/samples/supplychain/supplychain.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/supplychain/supplychain.svg
diff --git a/branches/sca-equinox/samples/web-resource/README b/sca-java-2.x/branches/sca-equinox/samples/web-resource/README
index 56bffba6a3..56bffba6a3 100644
--- a/branches/sca-equinox/samples/web-resource/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/web-resource/README
diff --git a/branches/sca-equinox/samples/web-resource/build.xml b/sca-java-2.x/branches/sca-equinox/samples/web-resource/build.xml
index 5f6b6091e7..5f6b6091e7 100644
--- a/branches/sca-equinox/samples/web-resource/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/web-resource/build.xml
diff --git a/branches/sca-equinox/samples/web-resource/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/web-resource/pom.xml
index ce78741eed..ce78741eed 100644
--- a/branches/sca-equinox/samples/web-resource/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/web-resource/pom.xml
diff --git a/branches/sca-equinox/samples/web-resource/src/main/java/web/resource/SampleServer.java b/sca-java-2.x/branches/sca-equinox/samples/web-resource/src/main/java/web/resource/SampleServer.java
index 9410de08c4..9410de08c4 100644
--- a/branches/sca-equinox/samples/web-resource/src/main/java/web/resource/SampleServer.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/web-resource/src/main/java/web/resource/SampleServer.java
diff --git a/branches/sca-equinox/samples/web-resource/src/main/resources/WebResource.composite b/sca-java-2.x/branches/sca-equinox/samples/web-resource/src/main/resources/WebResource.composite
index 4536136a8b..4536136a8b 100644
--- a/branches/sca-equinox/samples/web-resource/src/main/resources/WebResource.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/web-resource/src/main/resources/WebResource.composite
diff --git a/branches/sca-equinox/samples/web-resource/src/main/resources/myContent/index.html b/sca-java-2.x/branches/sca-equinox/samples/web-resource/src/main/resources/myContent/index.html
index 55de048373..55de048373 100644
--- a/branches/sca-equinox/samples/web-resource/src/main/resources/myContent/index.html
+++ b/sca-java-2.x/branches/sca-equinox/samples/web-resource/src/main/resources/myContent/index.html
diff --git a/branches/sca-equinox/samples/web-resource/web-resource.png b/sca-java-2.x/branches/sca-equinox/samples/web-resource/web-resource.png
index 7259447b65..7259447b65 100644
--- a/branches/sca-equinox/samples/web-resource/web-resource.png
+++ b/sca-java-2.x/branches/sca-equinox/samples/web-resource/web-resource.png
diff --git a/branches/sca-equinox/samples/web-resource/web-resource.svg b/sca-java-2.x/branches/sca-equinox/samples/web-resource/web-resource.svg
index 0d1257316c..0d1257316c 100644
--- a/branches/sca-equinox/samples/web-resource/web-resource.svg
+++ b/sca-java-2.x/branches/sca-equinox/samples/web-resource/web-resource.svg
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/LICENSE b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/LICENSE
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/NOTICE b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/NOTICE
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/README b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/README
index 12f81543f0..12f81543f0 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/README
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/README
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/build.xml b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/build.xml
index 85caf5954e..85caf5954e 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/build.xml
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/pom.xml b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/pom.xml
index ff493a5da2..ff493a5da2 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/pom.xml
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCode.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCode.java
index 8c9a48bf40..8c9a48bf40 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCode.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCode.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCodeResponse.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCodeResponse.java
index 93847c8809..93847c8809 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCodeResponse.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCodeResponse.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCity.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCity.java
index cf9276d417..cf9276d417 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCity.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCity.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCityResponse.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCityResponse.java
index 9dc0e41b2b..9dc0e41b2b 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCityResponse.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCityResponse.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByState.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByState.java
index 48be94b14a..48be94b14a 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByState.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByState.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByStateResponse.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByStateResponse.java
index 1645e11ca2..1645e11ca2 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByStateResponse.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByStateResponse.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIP.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIP.java
index 45c948b4b4..45c948b4b4 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIP.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIP.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIPResponse.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIPResponse.java
index 9e78dc6d0a..9e78dc6d0a 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIPResponse.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIPResponse.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/ObjectFactory.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/ObjectFactory.java
index ced83ff09a..ced83ff09a 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/ObjectFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/ObjectFactory.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZip.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZip.java
index 22493ba9b8..22493ba9b8 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZip.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZip.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZipSoap.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZipSoap.java
index 5ac370005f..5ac370005f 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZipSoap.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZipSoap.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/package-info.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/package-info.java
index d120f34ee5..d120f34ee5 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/package-info.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/uszip/package-info.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/ArrayOfWeatherData.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/ArrayOfWeatherData.java
index 5385fb57be..5385fb57be 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/ArrayOfWeatherData.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/ArrayOfWeatherData.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceName.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceName.java
index 9eb205e75d..9eb205e75d 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceName.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceName.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceNameResponse.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceNameResponse.java
index e281509623..e281509623 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceNameResponse.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceNameResponse.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCode.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCode.java
index 08d4a70364..08d4a70364 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCode.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCode.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCodeResponse.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCodeResponse.java
index 9288f5332e..9288f5332e 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCodeResponse.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCodeResponse.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/ObjectFactory.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/ObjectFactory.java
index 0c4fdbcde1..0c4fdbcde1 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/ObjectFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/ObjectFactory.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherData.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherData.java
index a4ca6190b5..a4ca6190b5 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherData.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherData.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecast.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecast.java
index 0902ce67fe..0902ce67fe 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecast.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecast.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecastSoap.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecastSoap.java
index aa000a44d2..aa000a44d2 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecastSoap.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecastSoap.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecasts.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecasts.java
index 8ded0946d9..8ded0946d9 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecasts.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecasts.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/package-info.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/package-info.java
index 6543ed7abf..6543ed7abf 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/package-info.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/com/example/weather/package-info.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/location/LocationClient.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/location/LocationClient.java
index 35c114093a..35c114093a 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/location/LocationClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/location/LocationClient.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java
index cf27332e60..cf27332e60 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastClient.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastClient.java
index c03cf2955f..c03cf2955f 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastClient.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java
index cf50a6cd9e..cf50a6cd9e 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeClient.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeClient.java
index c470230b7a..c470230b7a 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeClient.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeClient.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java
index ec0f05dd6c..ec0f05dd6c 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java
index 284e5a3aa3..284e5a3aa3 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/USLocation.composite b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/USLocation.composite
index a171fe62c9..a171fe62c9 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/USLocation.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/USLocation.composite
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/WeatherForecast.composite b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/WeatherForecast.composite
index 0e1b118e44..0e1b118e44 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/WeatherForecast.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/WeatherForecast.composite
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/ZipCode.composite b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/ZipCode.composite
index 28d674c29b..28d674c29b 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/ZipCode.composite
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/main/resources/ZipCode.composite
diff --git a/branches/sca-equinox/samples/zipcode-jaxws/src/test/java/zipcode/ZipCodeClientTestCase.java b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/test/java/zipcode/ZipCodeClientTestCase.java
index 019fce26d6..019fce26d6 100644
--- a/branches/sca-equinox/samples/zipcode-jaxws/src/test/java/zipcode/ZipCodeClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/samples/zipcode-jaxws/src/test/java/zipcode/ZipCodeClientTestCase.java
diff --git a/branches/sca-equinox/tools/eclipse/features/core/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse/features/core/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/core/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse/features/core/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/core/META-INF/MANIFEST.MF
index 63215d7c6f..63215d7c6f 100644
--- a/branches/sca-equinox/tools/eclipse/features/core/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/core/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse/features/core/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/core/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/eclipse/features/core/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/core/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse/features/core/build.properties b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/core/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-equinox/tools/eclipse/features/core/build.properties
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/core/build.properties
diff --git a/branches/sca-equinox/tools/eclipse/features/core/feature.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/core/feature.xml
index 1a20ac1eb1..1a20ac1eb1 100644
--- a/branches/sca-equinox/tools/eclipse/features/core/feature.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/core/feature.xml
diff --git a/branches/sca-equinox/tools/eclipse/features/core/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/core/pom.xml
index 943ef5e6ff..943ef5e6ff 100644
--- a/branches/sca-equinox/tools/eclipse/features/core/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/core/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse/features/ejava/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/ejava/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse/features/ejava/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/ejava/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse/features/ejava/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/ejava/META-INF/MANIFEST.MF
index f363ae7b2a..f363ae7b2a 100644
--- a/branches/sca-equinox/tools/eclipse/features/ejava/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/ejava/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse/features/ejava/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/ejava/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/eclipse/features/ejava/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/ejava/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse/features/ejava/build.properties b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/ejava/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-equinox/tools/eclipse/features/ejava/build.properties
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/ejava/build.properties
diff --git a/branches/sca-equinox/tools/eclipse/features/ejava/feature.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/ejava/feature.xml
index ef2ab6c2ba..ef2ab6c2ba 100644
--- a/branches/sca-equinox/tools/eclipse/features/ejava/feature.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/ejava/feature.xml
diff --git a/branches/sca-equinox/tools/eclipse/features/ejava/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/ejava/pom.xml
index 1c796804cd..1c796804cd 100644
--- a/branches/sca-equinox/tools/eclipse/features/ejava/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/ejava/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse/features/manager/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/manager/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse/features/manager/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/manager/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse/features/manager/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/manager/META-INF/MANIFEST.MF
index 8d8f5b271d..8d8f5b271d 100644
--- a/branches/sca-equinox/tools/eclipse/features/manager/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/manager/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse/features/manager/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/manager/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/eclipse/features/manager/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/manager/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse/features/manager/build.properties b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/manager/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-equinox/tools/eclipse/features/manager/build.properties
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/manager/build.properties
diff --git a/branches/sca-equinox/tools/eclipse/features/manager/feature.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/manager/feature.xml
index 189342993d..189342993d 100644
--- a/branches/sca-equinox/tools/eclipse/features/manager/feature.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/manager/feature.xml
diff --git a/branches/sca-equinox/tools/eclipse/features/manager/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/manager/pom.xml
index 453d00a5d4..453d00a5d4 100644
--- a/branches/sca-equinox/tools/eclipse/features/manager/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/manager/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse/features/process/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/process/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse/features/process/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/process/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse/features/process/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/process/META-INF/MANIFEST.MF
index 7f10d43405..7f10d43405 100644
--- a/branches/sca-equinox/tools/eclipse/features/process/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/process/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse/features/process/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/process/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/eclipse/features/process/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/process/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse/features/process/build.properties b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/process/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-equinox/tools/eclipse/features/process/build.properties
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/process/build.properties
diff --git a/branches/sca-equinox/tools/eclipse/features/process/feature.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/process/feature.xml
index 08332be61e..08332be61e 100644
--- a/branches/sca-equinox/tools/eclipse/features/process/feature.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/process/feature.xml
diff --git a/branches/sca-equinox/tools/eclipse/features/process/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/process/pom.xml
index 6890300a7c..6890300a7c 100644
--- a/branches/sca-equinox/tools/eclipse/features/process/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/process/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse/features/web20/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/web20/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse/features/web20/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/web20/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse/features/web20/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/web20/META-INF/MANIFEST.MF
index 2dc129ebaa..2dc129ebaa 100644
--- a/branches/sca-equinox/tools/eclipse/features/web20/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/web20/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse/features/web20/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/web20/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/eclipse/features/web20/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/web20/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse/features/web20/build.properties b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/web20/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-equinox/tools/eclipse/features/web20/build.properties
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/web20/build.properties
diff --git a/branches/sca-equinox/tools/eclipse/features/web20/feature.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/web20/feature.xml
index 8fe97d24a3..8fe97d24a3 100644
--- a/branches/sca-equinox/tools/eclipse/features/web20/feature.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/web20/feature.xml
diff --git a/branches/sca-equinox/tools/eclipse/features/web20/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/web20/pom.xml
index 87268b633f..87268b633f 100644
--- a/branches/sca-equinox/tools/eclipse/features/web20/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/web20/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse/features/webservice/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/webservice/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse/features/webservice/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/webservice/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse/features/webservice/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/webservice/META-INF/MANIFEST.MF
index 9fb9f1282b..9fb9f1282b 100644
--- a/branches/sca-equinox/tools/eclipse/features/webservice/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/webservice/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse/features/webservice/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/webservice/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/eclipse/features/webservice/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/webservice/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse/features/webservice/build.properties b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/webservice/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-equinox/tools/eclipse/features/webservice/build.properties
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/webservice/build.properties
diff --git a/branches/sca-equinox/tools/eclipse/features/webservice/feature.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/webservice/feature.xml
index d905b6475c..d905b6475c 100644
--- a/branches/sca-equinox/tools/eclipse/features/webservice/feature.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/webservice/feature.xml
diff --git a/branches/sca-equinox/tools/eclipse/features/webservice/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/webservice/pom.xml
index f7e0534e45..f7e0534e45 100644
--- a/branches/sca-equinox/tools/eclipse/features/webservice/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/features/webservice/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
index 0d8b1053bf..0d8b1053bf 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/build.properties b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/build.properties
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/build.properties
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd
index 6b6d79d45b..6b6d79d45b 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/icons/t.gif b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/icons/t.gif
index ba896ced08..ba896ced08 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/icons/t.gif
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/icons/t.gif
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/icons/tuscany.gif b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/icons/tuscany.gif
index 849dd76d4a..849dd76d4a 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/icons/tuscany.gif
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/icons/tuscany.gif
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java
index ee9a3d2de9..ee9a3d2de9 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java
index 7ea8d700f7..7ea8d700f7 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java
index 70e794d2ce..70e794d2ce 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java
index 53a8f8b32f..53a8f8b32f 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java
index 883c7c0781..883c7c0781 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java
index f90483a00d..f90483a00d 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java
index 4830268272..4830268272 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java
index 18850d9333..18850d9333 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java
index 909290859a..909290859a 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java
index 060f6ff6cb..060f6ff6cb 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java
index edbe4b3e69..edbe4b3e69 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java
index 056deb5b27..056deb5b27 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java
index 5f8ea73db4..5f8ea73db4 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java
index f66fa71191..f66fa71191 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java
index 6eba5ffdc2..6eba5ffdc2 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java
index 2a4c7206db..2a4c7206db 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java
index 5fc1a75960..5fc1a75960 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java
index 702da9701e..702da9701e 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java
index a1c6cb86a7..a1c6cb86a7 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java
index 5e059308e6..5e059308e6 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java
index 5d9f2bdf70..5d9f2bdf70 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/plugin.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/plugin.xml
index edc17c5ee2..edc17c5ee2 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/plugin.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/plugin.xml
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/pom.xml
index 939ddc5d15..939ddc5d15 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/src/main/assembly/jar.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/src/main/assembly/jar.xml
index 7832ba5131..7832ba5131 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/src/main/assembly/jar.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/src/main/assembly/jar.xml
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-all.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-all.xsd
index 1b19ede427..1b19ede427 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-all.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-all.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd
index 26bedfcce5..26bedfcce5 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd
index 850f32b56a..850f32b56a 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd
index 02703402ef..02703402ef 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd
index 3e92de193b..3e92de193b 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-contribution.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
index c7f92f6c3b..c7f92f6c3b 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-core.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-core.xsd
index 1c6291792b..1c6291792b 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-core.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-core.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-definitions.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-definitions.xsd
index 0249882a92..0249882a92 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-definitions.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-definitions.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd
index 87b443fb36..87b443fb36 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd
index 99669bc672..99669bc672 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd
index 6f1cf14a4b..6f1cf14a4b 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
index 1bca6199cb..1bca6199cb 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd
index f9d8171b8e..f9d8171b8e 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd
index 1cf9fb3ea9..1cf9fb3ea9 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd
index 44f14e5ed5..44f14e5ed5 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd
index 81f939bdb4..81f939bdb4 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd
index c1fdfd8f3c..c1fdfd8f3c 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-policy.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-policy.xsd
index c22ffd6618..c22ffd6618 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-policy.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-policy.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca.xsd
index 10f54275d0..10f54275d0 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
index c93a1d72de..c93a1d72de 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
index d0da5421ec..d0da5421ec 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd
index ff48b97d7a..ff48b97d7a 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
index 7c79738898..7c79738898 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd
index 6d5468b2f9..6d5468b2f9 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
index 26be6feae5..26be6feae5 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
index 821f323d73..821f323d73 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
index 1b5c8aece2..1b5c8aece2 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
index f8d437310e..f8d437310e 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
index f8ece54a07..f8ece54a07 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
index dd596821ea..dd596821ea 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd
index e1723d65f0..e1723d65f0 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
index 0c0998595f..0c0998595f 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
index cdabb697aa..cdabb697aa 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd
index da5e696e01..da5e696e01 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd
diff --git a/branches/sca-equinox/tools/eclipse/plugins/ejava/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/ejava/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/ejava/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/ejava/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse/plugins/ejava/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/ejava/META-INF/MANIFEST.MF
index fb238f04b1..fb238f04b1 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/ejava/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/ejava/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse/plugins/ejava/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/ejava/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/ejava/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/ejava/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse/plugins/ejava/build.properties b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/ejava/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/ejava/build.properties
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/ejava/build.properties
diff --git a/branches/sca-equinox/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java
index eae6682e3b..eae6682e3b 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java
index 9b7c199c79..9b7c199c79 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/ejava/plugin.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/ejava/plugin.xml
index fef1afe0b9..fef1afe0b9 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/ejava/plugin.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/ejava/plugin.xml
diff --git a/branches/sca-equinox/tools/eclipse/plugins/ejava/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/ejava/pom.xml
index 9c340135a5..9c340135a5 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/ejava/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/ejava/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse/plugins/manager/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/manager/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/manager/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/manager/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse/plugins/manager/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/manager/META-INF/MANIFEST.MF
index 2a70682fae..2a70682fae 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/manager/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/manager/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse/plugins/manager/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/manager/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/manager/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/manager/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse/plugins/manager/build.properties b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/manager/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/manager/build.properties
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/manager/build.properties
diff --git a/branches/sca-equinox/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java
index 3676883f87..3676883f87 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java
index 9c7df0f488..9c7df0f488 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/manager/plugin.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/manager/plugin.xml
index 2e09146dfd..2e09146dfd 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/manager/plugin.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/manager/plugin.xml
diff --git a/branches/sca-equinox/tools/eclipse/plugins/manager/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/manager/pom.xml
index 12077cdd54..12077cdd54 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/manager/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/manager/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse/plugins/process/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/process/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/process/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/process/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse/plugins/process/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/process/META-INF/MANIFEST.MF
index 0acd32e51c..0acd32e51c 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/process/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/process/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse/plugins/process/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/process/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/process/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/process/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse/plugins/process/build.properties b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/process/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/process/build.properties
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/process/build.properties
diff --git a/branches/sca-equinox/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java
index 225fa67b58..225fa67b58 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java
index dab0eeaadc..dab0eeaadc 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/process/plugin.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/process/plugin.xml
index 3e5f87f634..3e5f87f634 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/process/plugin.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/process/plugin.xml
diff --git a/branches/sca-equinox/tools/eclipse/plugins/process/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/process/pom.xml
index 7fed5e97cc..7fed5e97cc 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/process/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/process/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse/plugins/web20/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/web20/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/web20/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/web20/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse/plugins/web20/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/web20/META-INF/MANIFEST.MF
index 3c2816ec4b..3c2816ec4b 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/web20/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/web20/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse/plugins/web20/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/web20/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/web20/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/web20/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse/plugins/web20/build.properties b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/web20/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/web20/build.properties
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/web20/build.properties
diff --git a/branches/sca-equinox/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java
index e153ad3d25..e153ad3d25 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java
index 96026db08e..96026db08e 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/web20/plugin.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/web20/plugin.xml
index 6bf9087474..6bf9087474 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/web20/plugin.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/web20/plugin.xml
diff --git a/branches/sca-equinox/tools/eclipse/plugins/web20/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/web20/pom.xml
index 80dbe131c0..80dbe131c0 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/web20/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/web20/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse/plugins/webservice/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/webservice/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/webservice/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/webservice/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse/plugins/webservice/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/webservice/META-INF/MANIFEST.MF
index 9d83fd9b6b..9d83fd9b6b 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/webservice/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/webservice/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/tools/eclipse/plugins/webservice/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/webservice/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/webservice/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/webservice/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse/plugins/webservice/build.properties b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/webservice/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/webservice/build.properties
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/webservice/build.properties
diff --git a/branches/sca-equinox/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java
index f588dc191c..f588dc191c 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java
index 6310209c3a..6310209c3a 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java
diff --git a/branches/sca-equinox/tools/eclipse/plugins/webservice/plugin.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/webservice/plugin.xml
index 1fd46d3e75..1fd46d3e75 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/webservice/plugin.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/webservice/plugin.xml
diff --git a/branches/sca-equinox/tools/eclipse/plugins/webservice/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/webservice/pom.xml
index d3e508c1e4..d3e508c1e4 100644
--- a/branches/sca-equinox/tools/eclipse/plugins/webservice/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/plugins/webservice/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/pom.xml
index 47123ce999..47123ce999 100644
--- a/branches/sca-equinox/tools/eclipse/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse/site/updatesite/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/site/updatesite/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/eclipse/site/updatesite/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/site/updatesite/LICENSE
diff --git a/branches/sca-equinox/tools/eclipse/site/updatesite/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/eclipse/site/updatesite/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/eclipse/site/updatesite/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/site/updatesite/NOTICE
diff --git a/branches/sca-equinox/tools/eclipse/site/updatesite/etc/generate-p2.sh b/sca-java-2.x/branches/sca-equinox/tools/eclipse/site/updatesite/etc/generate-p2.sh
index ea2eb865f4..ea2eb865f4 100755
--- a/branches/sca-equinox/tools/eclipse/site/updatesite/etc/generate-p2.sh
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/site/updatesite/etc/generate-p2.sh
diff --git a/branches/sca-equinox/tools/eclipse/site/updatesite/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/site/updatesite/pom.xml
index 89992f9bdb..89992f9bdb 100644
--- a/branches/sca-equinox/tools/eclipse/site/updatesite/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/site/updatesite/pom.xml
diff --git a/branches/sca-equinox/tools/eclipse/site/updatesite/site.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/site/updatesite/site.xml
index 5332e319c8..5332e319c8 100644
--- a/branches/sca-equinox/tools/eclipse/site/updatesite/site.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/site/updatesite/site.xml
diff --git a/branches/sca-equinox/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml b/sca-java-2.x/branches/sca-equinox/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
index c1225e320b..c1225e320b 100644
--- a/branches/sca-equinox/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
diff --git a/branches/sca-equinox/tools/maven/maven-ant-generator/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-ant-generator/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/maven/maven-ant-generator/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-ant-generator/LICENSE
diff --git a/branches/sca-equinox/tools/maven/maven-ant-generator/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-ant-generator/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/maven/maven-ant-generator/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-ant-generator/NOTICE
diff --git a/branches/sca-equinox/tools/maven/maven-ant-generator/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-ant-generator/pom.xml
index 3f1aa866d6..3f1aa866d6 100644
--- a/branches/sca-equinox/tools/maven/maven-ant-generator/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-ant-generator/pom.xml
diff --git a/branches/sca-equinox/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
index d7b80bd67c..d7b80bd67c 100644
--- a/branches/sca-equinox/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
diff --git a/branches/sca-equinox/tools/maven/maven-bundle-plugin/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/pom.xml
index 8b8bd996af..8b8bd996af 100644
--- a/branches/sca-equinox/tools/maven/maven-bundle-plugin/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/pom.xml
diff --git a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/AbstractIdeSupportMojo.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/AbstractIdeSupportMojo.java
index d0961ccd9c..d0961ccd9c 100644
--- a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/AbstractIdeSupportMojo.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/AbstractIdeSupportMojo.java
diff --git a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/EclipseClasspathWriter.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/EclipseClasspathWriter.java
index 2813eb5388..2813eb5388 100644
--- a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/EclipseClasspathWriter.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/EclipseClasspathWriter.java
diff --git a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/EclipseCleanMojo.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/EclipseCleanMojo.java
index ac770c743c..ac770c743c 100644
--- a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/EclipseCleanMojo.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/EclipseCleanMojo.java
diff --git a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/EclipsePlugin.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/EclipsePlugin.java
index f2049c2cde..f2049c2cde 100644
--- a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/EclipsePlugin.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/EclipsePlugin.java
diff --git a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/EclipseProjectWriter.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/EclipseProjectWriter.java
index 070b9b3e8b..070b9b3e8b 100644
--- a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/EclipseProjectWriter.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/EclipseProjectWriter.java
diff --git a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/Messages.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/Messages.java
index 553cae6256..553cae6256 100644
--- a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/Messages.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/maven/plugin/eclipse/Messages.java
diff --git a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ArtifactAggregation.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ArtifactAggregation.java
index 062c935ad9..062c935ad9 100644
--- a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ArtifactAggregation.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ArtifactAggregation.java
diff --git a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ArtifactMember.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ArtifactMember.java
index 19315aa19f..19315aa19f 100644
--- a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ArtifactMember.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ArtifactMember.java
diff --git a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/BundleUtil.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/BundleUtil.java
index f104225483..f104225483 100644
--- a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/BundleUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/BundleUtil.java
diff --git a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ModuleBundlesBuildMojo.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ModuleBundlesBuildMojo.java
index de03d0d6d2..de03d0d6d2 100644
--- a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ModuleBundlesBuildMojo.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ModuleBundlesBuildMojo.java
diff --git a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleBuildMojo.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleBuildMojo.java
index e183e7e197..e183e7e197 100644
--- a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleBuildMojo.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleBuildMojo.java
diff --git a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/resources/org/apache/tuscany/sca/maven/plugin/eclipse/messages.properties b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/resources/org/apache/tuscany/sca/maven/plugin/eclipse/messages.properties
index 11de16d7a8..11de16d7a8 100644
--- a/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/resources/org/apache/tuscany/sca/maven/plugin/eclipse/messages.properties
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/resources/org/apache/tuscany/sca/maven/plugin/eclipse/messages.properties
diff --git a/branches/sca-equinox/tools/maven/maven-dependency-lister/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-dependency-lister/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/tools/maven/maven-dependency-lister/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-dependency-lister/LICENSE
diff --git a/branches/sca-equinox/tools/maven/maven-dependency-lister/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-dependency-lister/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/tools/maven/maven-dependency-lister/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-dependency-lister/NOTICE
diff --git a/branches/sca-equinox/tools/maven/maven-dependency-lister/README b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-dependency-lister/README
index d53760029f..d53760029f 100644
--- a/branches/sca-equinox/tools/maven/maven-dependency-lister/README
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-dependency-lister/README
diff --git a/branches/sca-equinox/tools/maven/maven-dependency-lister/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-dependency-lister/pom.xml
index b294bcfb41..b294bcfb41 100644
--- a/branches/sca-equinox/tools/maven/maven-dependency-lister/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-dependency-lister/pom.xml
diff --git a/branches/sca-equinox/tools/maven/maven-dependency-lister/src/main/java/org/apache/tuscany/tools/sca/dependency/lister/plugin/DependencyListerMojo.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-dependency-lister/src/main/java/org/apache/tuscany/tools/sca/dependency/lister/plugin/DependencyListerMojo.java
index b904ac4804..b904ac4804 100644
--- a/branches/sca-equinox/tools/maven/maven-dependency-lister/src/main/java/org/apache/tuscany/tools/sca/dependency/lister/plugin/DependencyListerMojo.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-dependency-lister/src/main/java/org/apache/tuscany/tools/sca/dependency/lister/plugin/DependencyListerMojo.java
diff --git a/branches/sca-equinox/tools/maven/maven-eclipse-compiler/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-eclipse-compiler/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/maven/maven-eclipse-compiler/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-eclipse-compiler/LICENSE
diff --git a/branches/sca-equinox/tools/maven/maven-eclipse-compiler/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-eclipse-compiler/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/maven/maven-eclipse-compiler/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-eclipse-compiler/NOTICE
diff --git a/branches/sca-equinox/tools/maven/maven-eclipse-compiler/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-eclipse-compiler/pom.xml
index 127818afbb..127818afbb 100644
--- a/branches/sca-equinox/tools/maven/maven-eclipse-compiler/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-eclipse-compiler/pom.xml
diff --git a/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/ClassLoaderNameEnvironment.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/ClassLoaderNameEnvironment.java
index 4b3f84edf4..4b3f84edf4 100644
--- a/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/ClassLoaderNameEnvironment.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/ClassLoaderNameEnvironment.java
diff --git a/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/CompilerRequestor.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/CompilerRequestor.java
index 3df4b4d602..3df4b4d602 100644
--- a/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/CompilerRequestor.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/CompilerRequestor.java
diff --git a/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/FileCompilationUnit.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/FileCompilationUnit.java
index 08ed7f034e..08ed7f034e 100644
--- a/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/FileCompilationUnit.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/FileCompilationUnit.java
diff --git a/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java
index eb33804862..eb33804862 100644
--- a/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java
diff --git a/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/osgi/BundleResolver.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/osgi/BundleResolver.java
index b3bf4ee4cd..b3bf4ee4cd 100644
--- a/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/osgi/BundleResolver.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/osgi/BundleResolver.java
diff --git a/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/osgi/BundleUtil.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/osgi/BundleUtil.java
index 9e99fe4790..9e99fe4790 100644
--- a/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/osgi/BundleUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/osgi/BundleUtil.java
diff --git a/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/resources/META-INF/plexus/components.xml b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/resources/META-INF/plexus/components.xml
index 4332d3f205..4332d3f205 100644
--- a/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/resources/META-INF/plexus/components.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/resources/META-INF/plexus/components.xml
diff --git a/branches/sca-equinox/tools/maven/maven-incremental-build/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-incremental-build/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/maven/maven-incremental-build/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-incremental-build/LICENSE
diff --git a/branches/sca-equinox/tools/maven/maven-incremental-build/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-incremental-build/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/maven/maven-incremental-build/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-incremental-build/NOTICE
diff --git a/branches/sca-equinox/tools/maven/maven-incremental-build/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-incremental-build/pom.xml
index 1ce5e333a4..1ce5e333a4 100644
--- a/branches/sca-equinox/tools/maven/maven-incremental-build/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-incremental-build/pom.xml
diff --git a/branches/sca-equinox/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
index 3a6870732b..3a6870732b 100644
--- a/branches/sca-equinox/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
diff --git a/branches/sca-equinox/tools/maven/maven-java2wsdl/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-java2wsdl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/maven/maven-java2wsdl/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-java2wsdl/LICENSE
diff --git a/branches/sca-equinox/tools/maven/maven-java2wsdl/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-java2wsdl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/maven/maven-java2wsdl/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-java2wsdl/NOTICE
diff --git a/branches/sca-equinox/tools/maven/maven-java2wsdl/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-java2wsdl/pom.xml
index 5aa51d8a5e..5aa51d8a5e 100644
--- a/branches/sca-equinox/tools/maven/maven-java2wsdl/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-java2wsdl/pom.xml
diff --git a/branches/sca-equinox/tools/maven/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java
index 620e32a6fd..620e32a6fd 100644
--- a/branches/sca-equinox/tools/maven/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java
diff --git a/branches/sca-equinox/tools/maven/maven-osgi-junit/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-osgi-junit/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/tools/maven/maven-osgi-junit/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-osgi-junit/LICENSE
diff --git a/branches/sca-equinox/tools/maven/maven-osgi-junit/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-osgi-junit/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/tools/maven/maven-osgi-junit/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-osgi-junit/NOTICE
diff --git a/branches/sca-equinox/tools/maven/maven-osgi-junit/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-osgi-junit/pom.xml
index 3029892b54..3029892b54 100644
--- a/branches/sca-equinox/tools/maven/maven-osgi-junit/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-osgi-junit/pom.xml
diff --git a/branches/sca-equinox/tools/maven/maven-osgi-junit/src/main/java/org/apache/tuscany/tools/sca/osgi/junit/plugin/OSGiJUnitMojo.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-osgi-junit/src/main/java/org/apache/tuscany/tools/sca/osgi/junit/plugin/OSGiJUnitMojo.java
index a2251a6a2a..a2251a6a2a 100644
--- a/branches/sca-equinox/tools/maven/maven-osgi-junit/src/main/java/org/apache/tuscany/tools/sca/osgi/junit/plugin/OSGiJUnitMojo.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-osgi-junit/src/main/java/org/apache/tuscany/tools/sca/osgi/junit/plugin/OSGiJUnitMojo.java
diff --git a/branches/sca-equinox/tools/maven/maven-web-junit/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-web-junit/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/tools/maven/maven-web-junit/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-web-junit/LICENSE
diff --git a/branches/sca-equinox/tools/maven/maven-web-junit/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-web-junit/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/tools/maven/maven-web-junit/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-web-junit/NOTICE
diff --git a/branches/sca-equinox/tools/maven/maven-web-junit/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-web-junit/pom.xml
index 996f0e8026..996f0e8026 100644
--- a/branches/sca-equinox/tools/maven/maven-web-junit/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-web-junit/pom.xml
diff --git a/branches/sca-equinox/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java
index d1afe2c995..d1afe2c995 100644
--- a/branches/sca-equinox/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java
diff --git a/branches/sca-equinox/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java
index 658d65d7c3..658d65d7c3 100644
--- a/branches/sca-equinox/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java
diff --git a/branches/sca-equinox/tools/maven/maven-wsdl2java/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-wsdl2java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/maven/maven-wsdl2java/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-wsdl2java/LICENSE
diff --git a/branches/sca-equinox/tools/maven/maven-wsdl2java/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-wsdl2java/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/maven/maven-wsdl2java/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-wsdl2java/NOTICE
diff --git a/branches/sca-equinox/tools/maven/maven-wsdl2java/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-wsdl2java/pom.xml
index f46aed7b8e..f46aed7b8e 100644
--- a/branches/sca-equinox/tools/maven/maven-wsdl2java/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-wsdl2java/pom.xml
diff --git a/branches/sca-equinox/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java
index 8021692521..8021692521 100644
--- a/branches/sca-equinox/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java
diff --git a/branches/sca-equinox/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java
index cc10c351b1..cc10c351b1 100644
--- a/branches/sca-equinox/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java
diff --git a/branches/sca-equinox/tools/maven/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/maven/pom.xml
index e216c6e4d9..e216c6e4d9 100644
--- a/branches/sca-equinox/tools/maven/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/maven/pom.xml
diff --git a/branches/sca-equinox/tools/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/pom.xml
index 6dabf18525..6dabf18525 100644
--- a/branches/sca-equinox/tools/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/pom.xml
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/LICENSE
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/NOTICE
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/pom.xml
index b46f14c5fe..b46f14c5fe 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/pom.xml
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
index 60afe70534..60afe70534 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
index a890dd624d..a890dd624d 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
index 9c8ff9df9e..9c8ff9df9e 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
index e8f3db95b0..e8f3db95b0 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
index bce30a48d3..bce30a48d3 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
index 897700ffd9..897700ffd9 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
index fd10c77f8b..fd10c77f8b 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
index 18cfafa4e3..18cfafa4e3 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
index 3750dc27f5..3750dc27f5 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
index d6cd8a7f57..d6cd8a7f57 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
index 03291428a2..03291428a2 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
index cb41c56b94..cb41c56b94 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
index 66c9100ef9..66c9100ef9 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
index e30ada3af5..e30ada3af5 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
index 788d162f34..788d162f34 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
index b30b8cd62b..b30b8cd62b 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/resources/META-INF/LICENSE.txt b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/resources/META-INF/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
index 135b374357..135b374357 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
index dfebd77215..dfebd77215 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
index 5406025643..5406025643 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
index c587252d23..c587252d23 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
index bf49d98888..bf49d98888 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
index cf83095852..cf83095852 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
index 901da8e551..901da8e551 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
index 78a64dcc64..78a64dcc64 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/AccountService.wsdl b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/AccountService.wsdl
index 6f2fed1e2a..6f2fed1e2a 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/AccountService.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/AccountService.wsdl
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
index 09d1a58589..09d1a58589 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/helloworld.wsdl
index 051f604bb2..051f604bb2 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/helloworld.wsdl
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/interopdoc.wsdl b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/interopdoc.wsdl
index 820c26ca34..820c26ca34 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/interopdoc.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/interopdoc.wsdl
diff --git a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/sequences.xsd b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/sequences.xsd
index a565f3fa65..a565f3fa65 100644
--- a/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/sequences.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/java2wsdl/src/test/resources/sequences.xsd
diff --git a/branches/sca-equinox/tools/sdo/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/sdo/pom.xml
index e0dbd1f07b..e0dbd1f07b 100644
--- a/branches/sca-equinox/tools/sdo/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/pom.xml
diff --git a/branches/sca-equinox/tools/sdo/wsdl2java/LICENSE b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-equinox/tools/sdo/wsdl2java/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/LICENSE
diff --git a/branches/sca-equinox/tools/sdo/wsdl2java/NOTICE b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-equinox/tools/sdo/wsdl2java/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/NOTICE
diff --git a/branches/sca-equinox/tools/sdo/wsdl2java/pom.xml b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/pom.xml
index b4a82ef6bc..b4a82ef6bc 100644
--- a/branches/sca-equinox/tools/sdo/wsdl2java/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/pom.xml
diff --git a/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
index 08c7131208..08c7131208 100644
--- a/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
diff --git a/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
index 8e0c3683a3..8e0c3683a3 100644
--- a/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
diff --git a/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
index 0c4f42633a..0c4f42633a 100644
--- a/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
diff --git a/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
index 4ab152fb90..4ab152fb90 100644
--- a/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
diff --git a/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
index 2d81ef12bf..2d81ef12bf 100644
--- a/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
diff --git a/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
index f6d1f3a64a..f6d1f3a64a 100644
--- a/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
diff --git a/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
index d0b325982c..d0b325982c 100644
--- a/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
diff --git a/branches/sca-equinox/tools/sdo/wsdl2java/src/main/resources/META-INF/LICENSE.txt b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/main/resources/META-INF/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/sca-equinox/tools/sdo/wsdl2java/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-equinox/tools/sdo/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
index 43005bcdbc..43005bcdbc 100644
--- a/branches/sca-equinox/tools/sdo/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
diff --git a/branches/sca-equinox/tools/sdo/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
index 92581d6ac2..92581d6ac2 100644
--- a/branches/sca-equinox/tools/sdo/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
diff --git a/branches/sca-equinox/tools/sdo/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
index e9e8aa882a..e9e8aa882a 100644
--- a/branches/sca-equinox/tools/sdo/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
diff --git a/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/AccountService.wsdl b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/AccountService.wsdl
index 6f2fed1e2a..6f2fed1e2a 100644
--- a/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/AccountService.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/AccountService.wsdl
diff --git a/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
index dda5a36085..dda5a36085 100644
--- a/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
diff --git a/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
index 09d1a58589..09d1a58589 100644
--- a/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
diff --git a/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/helloworld.wsdl b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/helloworld.wsdl
index 051f604bb2..051f604bb2 100644
--- a/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/helloworld.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/helloworld.wsdl
diff --git a/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/interopdoc.wsdl b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/interopdoc.wsdl
index 820c26ca34..820c26ca34 100644
--- a/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/interopdoc.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/interopdoc.wsdl
diff --git a/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/sequences.xsd b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/sequences.xsd
index a565f3fa65..a565f3fa65 100644
--- a/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/sequences.xsd
+++ b/sca-java-2.x/branches/sca-equinox/tools/sdo/wsdl2java/src/test/resources/sequences.xsd
diff --git a/branches/sca-equinox/tutorials/pom.xml b/sca-java-2.x/branches/sca-equinox/tutorials/pom.xml
index 7978c90e79..7978c90e79 100644
--- a/branches/sca-equinox/tutorials/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/pom.xml
diff --git a/branches/sca-equinox/tutorials/store/README b/sca-java-2.x/branches/sca-equinox/tutorials/store/README
index 6169a05292..6169a05292 100644
--- a/branches/sca-equinox/tutorials/store/README
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/README
diff --git a/branches/sca-equinox/tutorials/store/Tutorial.pdf b/sca-java-2.x/branches/sca-equinox/tutorials/store/Tutorial.pdf
index e22f1b4c9d..e22f1b4c9d 100644
--- a/branches/sca-equinox/tutorials/store/Tutorial.pdf
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/Tutorial.pdf
diff --git a/branches/sca-equinox/tutorials/store/assets/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/META-INF/sca-contribution.xml
index cba1564cb4..cba1564cb4 100644
--- a/branches/sca-equinox/tutorials/store/assets/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/tutorials/store/assets/pom.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/pom.xml
index 420a07ed6f..420a07ed6f 100644
--- a/branches/sca-equinox/tutorials/store/assets/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/pom.xml
diff --git a/branches/sca-equinox/tutorials/store/assets/services/Cart.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/Cart.java
index 9e6226d963..9e6226d963 100644
--- a/branches/sca-equinox/tutorials/store/assets/services/Cart.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/Cart.java
diff --git a/branches/sca-equinox/tutorials/store/assets/services/Catalog.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/Catalog.java
index 2c3b19f579..2c3b19f579 100644
--- a/branches/sca-equinox/tutorials/store/assets/services/Catalog.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/Catalog.java
diff --git a/branches/sca-equinox/tutorials/store/assets/services/CurrencyConverter.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/CurrencyConverter.java
index e104a0423a..e104a0423a 100644
--- a/branches/sca-equinox/tutorials/store/assets/services/CurrencyConverter.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/CurrencyConverter.java
diff --git a/branches/sca-equinox/tutorials/store/assets/services/CurrencyConverterImpl.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/CurrencyConverterImpl.java
index c354aed447..c354aed447 100644
--- a/branches/sca-equinox/tutorials/store/assets/services/CurrencyConverterImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/CurrencyConverterImpl.java
diff --git a/branches/sca-equinox/tutorials/store/assets/services/FruitsCatalogImpl.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/FruitsCatalogImpl.java
index 377b3d7e59..377b3d7e59 100644
--- a/branches/sca-equinox/tutorials/store/assets/services/FruitsCatalogImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/FruitsCatalogImpl.java
diff --git a/branches/sca-equinox/tutorials/store/assets/services/Item.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/Item.java
index 81cefcdbef..81cefcdbef 100644
--- a/branches/sca-equinox/tutorials/store/assets/services/Item.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/Item.java
diff --git a/branches/sca-equinox/tutorials/store/assets/services/ShoppingCartImpl.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/ShoppingCartImpl.java
index 9889921a96..9889921a96 100644
--- a/branches/sca-equinox/tutorials/store/assets/services/ShoppingCartImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/ShoppingCartImpl.java
diff --git a/branches/sca-equinox/tutorials/store/assets/services/Total.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/Total.java
index 8f464e526f..8f464e526f 100644
--- a/branches/sca-equinox/tutorials/store/assets/services/Total.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/Total.java
diff --git a/branches/sca-equinox/tutorials/store/assets/services/VegetablesCatalogImpl.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/VegetablesCatalogImpl.java
index 8bfbc757db..8bfbc757db 100644
--- a/branches/sca-equinox/tutorials/store/assets/services/VegetablesCatalogImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/VegetablesCatalogImpl.java
diff --git a/branches/sca-equinox/tutorials/store/assets/services/db/ShoppingCartTableImpl.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/db/ShoppingCartTableImpl.java
index cfc52c563c..cfc52c563c 100644
--- a/branches/sca-equinox/tutorials/store/assets/services/db/ShoppingCartTableImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/db/ShoppingCartTableImpl.java
diff --git a/branches/sca-equinox/tutorials/store/assets/services/db/cart.sql b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/db/cart.sql
index 25f16cb36b..25f16cb36b 100644
--- a/branches/sca-equinox/tutorials/store/assets/services/db/cart.sql
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/db/cart.sql
diff --git a/branches/sca-equinox/tutorials/store/assets/services/map/FruitsCatalogImpl.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/map/FruitsCatalogImpl.java
index b160ba7be0..b160ba7be0 100644
--- a/branches/sca-equinox/tutorials/store/assets/services/map/FruitsCatalogImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/map/FruitsCatalogImpl.java
diff --git a/branches/sca-equinox/tutorials/store/assets/services/market/MarketCatalogImpl.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/market/MarketCatalogImpl.java
index bd2c7d76a2..bd2c7d76a2 100644
--- a/branches/sca-equinox/tutorials/store/assets/services/market/MarketCatalogImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/market/MarketCatalogImpl.java
diff --git a/branches/sca-equinox/tutorials/store/assets/services/merger/MergedCatalogImpl.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/merger/MergedCatalogImpl.java
index c02b4e821e..c02b4e821e 100644
--- a/branches/sca-equinox/tutorials/store/assets/services/merger/MergedCatalogImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/services/merger/MergedCatalogImpl.java
diff --git a/branches/sca-equinox/tutorials/store/assets/tutorial.html b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/tutorial.html
index 14f81e0c22..14f81e0c22 100644
--- a/branches/sca-equinox/tutorials/store/assets/tutorial.html
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/tutorial.html
diff --git a/branches/sca-equinox/tutorials/store/assets/uiservices/store.html b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/uiservices/store.html
index f2425b4885..f2425b4885 100644
--- a/branches/sca-equinox/tutorials/store/assets/uiservices/store.html
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/assets/uiservices/store.html
diff --git a/branches/sca-equinox/tutorials/store/catalog-ejb/pom.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/pom.xml
index 45bc053843..45bc053843 100644
--- a/branches/sca-equinox/tutorials/store/catalog-ejb/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/pom.xml
diff --git a/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBHome.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBHome.java
index c7ad31b682..c7ad31b682 100644
--- a/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBHome.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBHome.java
diff --git a/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBRemote.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBRemote.java
index 7e79fc8b9d..7e79fc8b9d 100644
--- a/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBRemote.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBRemote.java
diff --git a/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/java/services/ejb/Vegetable.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/java/services/ejb/Vegetable.java
index cf81539ba5..cf81539ba5 100644
--- a/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/java/services/ejb/Vegetable.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/java/services/ejb/Vegetable.java
diff --git a/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBSessionBean.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBSessionBean.java
index ff2004fe1b..ff2004fe1b 100644
--- a/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBSessionBean.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBSessionBean.java
diff --git a/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml
index a0a7adf6fa..a0a7adf6fa 100644
--- a/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml
diff --git a/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
index 04d77ee39e..04d77ee39e 100644
--- a/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
diff --git a/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml
index 2e46b31047..2e46b31047 100644
--- a/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType
index bc57b35e79..bc57b35e79 100644
--- a/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType
diff --git a/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/resources/catalog-ejb.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/resources/catalog-ejb.composite
index f733524809..f733524809 100644
--- a/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/resources/catalog-ejb.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/main/resources/catalog-ejb.composite
diff --git a/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java
index f9bd16f050..f9bd16f050 100644
--- a/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java
diff --git a/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java
index 6930093042..6930093042 100644
--- a/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java
diff --git a/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java
index 3482ebb9ec..3482ebb9ec 100644
--- a/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java
diff --git a/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java
index d848fbb280..d848fbb280 100644
--- a/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java
diff --git a/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java
index 6efc86b608..6efc86b608 100644
--- a/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java
diff --git a/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java
index bdc1a5cfd5..bdc1a5cfd5 100644
--- a/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java
diff --git a/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java
index a24108714e..a24108714e 100644
--- a/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java
diff --git a/branches/sca-equinox/tutorials/store/catalog-mediation/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-mediation/META-INF/sca-contribution.xml
index 88950bf740..88950bf740 100644
--- a/branches/sca-equinox/tutorials/store/catalog-mediation/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-mediation/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/tutorials/store/catalog-mediation/catalog-mediation.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-mediation/catalog-mediation.composite
index d832e88acc..d832e88acc 100644
--- a/branches/sca-equinox/tutorials/store/catalog-mediation/catalog-mediation.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-mediation/catalog-mediation.composite
diff --git a/branches/sca-equinox/tutorials/store/catalog-mediation/pom.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-mediation/pom.xml
index 2de6fc56cf..2de6fc56cf 100644
--- a/branches/sca-equinox/tutorials/store/catalog-mediation/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-mediation/pom.xml
diff --git a/branches/sca-equinox/tutorials/store/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java
index 6cfa54e9de..6cfa54e9de 100644
--- a/branches/sca-equinox/tutorials/store/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java
diff --git a/branches/sca-equinox/tutorials/store/catalog-webapp/catalog-web.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-webapp/catalog-web.composite
index 3ba76da078..3ba76da078 100644
--- a/branches/sca-equinox/tutorials/store/catalog-webapp/catalog-web.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-webapp/catalog-web.composite
diff --git a/branches/sca-equinox/tutorials/store/catalog-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-webapp/pom.xml
index b689d869ab..b689d869ab 100644
--- a/branches/sca-equinox/tutorials/store/catalog-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-webapp/pom.xml
diff --git a/branches/sca-equinox/tutorials/store/catalog-webapp/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-webapp/webapp/META-INF/sca-contribution.xml
index 7f06dc7ccb..7f06dc7ccb 100644
--- a/branches/sca-equinox/tutorials/store/catalog-webapp/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-webapp/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/tutorials/store/catalog-webapp/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-webapp/webapp/WEB-INF/web.xml
index e08d617dad..e08d617dad 100644
--- a/branches/sca-equinox/tutorials/store/catalog-webapp/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-webapp/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/tutorials/store/catalog-webapp/webapp/catalog.jsp b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-webapp/webapp/catalog.jsp
index dcee7c33f4..dcee7c33f4 100644
--- a/branches/sca-equinox/tutorials/store/catalog-webapp/webapp/catalog.jsp
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/catalog-webapp/webapp/catalog.jsp
diff --git a/branches/sca-equinox/tutorials/store/domain/cloud.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud.composite
index 8f879c5261..8f879c5261 100644
--- a/branches/sca-equinox/tutorials/store/domain/cloud.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud.composite
diff --git a/branches/sca-equinox/tutorials/store/domain/cloud/CatalogEJBNode.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/CatalogEJBNode.composite
index 02e83d4c8d..02e83d4c8d 100644
--- a/branches/sca-equinox/tutorials/store/domain/cloud/CatalogEJBNode.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/CatalogEJBNode.composite
diff --git a/branches/sca-equinox/tutorials/store/domain/cloud/CatalogMediationNode.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/CatalogMediationNode.composite
index bac96d9781..bac96d9781 100644
--- a/branches/sca-equinox/tutorials/store/domain/cloud/CatalogMediationNode.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/CatalogMediationNode.composite
diff --git a/branches/sca-equinox/tutorials/store/domain/cloud/CatalogWebAppNode.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/CatalogWebAppNode.composite
index f3ed2dfdd5..f3ed2dfdd5 100644
--- a/branches/sca-equinox/tutorials/store/domain/cloud/CatalogWebAppNode.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/CatalogWebAppNode.composite
diff --git a/branches/sca-equinox/tutorials/store/domain/cloud/CatalogsNode.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/CatalogsNode.composite
index 3a5ec770cb..3a5ec770cb 100644
--- a/branches/sca-equinox/tutorials/store/domain/cloud/CatalogsNode.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/CatalogsNode.composite
diff --git a/branches/sca-equinox/tutorials/store/domain/cloud/CurrencyNode.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/CurrencyNode.composite
index ed80268f22..ed80268f22 100644
--- a/branches/sca-equinox/tutorials/store/domain/cloud/CurrencyNode.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/CurrencyNode.composite
diff --git a/branches/sca-equinox/tutorials/store/domain/cloud/StoreClientNode.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/StoreClientNode.composite
index 91948b5476..91948b5476 100644
--- a/branches/sca-equinox/tutorials/store/domain/cloud/StoreClientNode.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/StoreClientNode.composite
diff --git a/branches/sca-equinox/tutorials/store/domain/cloud/StoreDBNode.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/StoreDBNode.composite
index 9b09bd7344..9b09bd7344 100644
--- a/branches/sca-equinox/tutorials/store/domain/cloud/StoreDBNode.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/StoreDBNode.composite
diff --git a/branches/sca-equinox/tutorials/store/domain/cloud/StoreEUNode.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/StoreEUNode.composite
index 6a50de56d5..6a50de56d5 100644
--- a/branches/sca-equinox/tutorials/store/domain/cloud/StoreEUNode.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/StoreEUNode.composite
diff --git a/branches/sca-equinox/tutorials/store/domain/cloud/StoreMarketNode.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/StoreMarketNode.composite
index 1bdd994c2b..1bdd994c2b 100644
--- a/branches/sca-equinox/tutorials/store/domain/cloud/StoreMarketNode.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/StoreMarketNode.composite
diff --git a/branches/sca-equinox/tutorials/store/domain/cloud/StoreMashupNode.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/StoreMashupNode.composite
index 0db43df8c3..0db43df8c3 100644
--- a/branches/sca-equinox/tutorials/store/domain/cloud/StoreMashupNode.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/StoreMashupNode.composite
diff --git a/branches/sca-equinox/tutorials/store/domain/cloud/StoreMergerNode.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/StoreMergerNode.composite
index 0ce6e6a231..0ce6e6a231 100644
--- a/branches/sca-equinox/tutorials/store/domain/cloud/StoreMergerNode.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/StoreMergerNode.composite
diff --git a/branches/sca-equinox/tutorials/store/domain/cloud/StoreNode.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/StoreNode.composite
index e2b61a98e1..e2b61a98e1 100644
--- a/branches/sca-equinox/tutorials/store/domain/cloud/StoreNode.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/StoreNode.composite
diff --git a/branches/sca-equinox/tutorials/store/domain/cloud/StoreSupplierNode.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/StoreSupplierNode.composite
index df46bb8813..df46bb8813 100644
--- a/branches/sca-equinox/tutorials/store/domain/cloud/StoreSupplierNode.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/cloud/StoreSupplierNode.composite
diff --git a/branches/sca-equinox/tutorials/store/domain/domain.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/domain.composite
index 8d47697df8..8d47697df8 100644
--- a/branches/sca-equinox/tutorials/store/domain/domain.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/domain.composite
diff --git a/branches/sca-equinox/tutorials/store/domain/launch/LaunchCatalogMediationNode.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/launch/LaunchCatalogMediationNode.java
index 4e0772d211..4e0772d211 100644
--- a/branches/sca-equinox/tutorials/store/domain/launch/LaunchCatalogMediationNode.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/launch/LaunchCatalogMediationNode.java
diff --git a/branches/sca-equinox/tutorials/store/domain/launch/LaunchCatalogsNode.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/launch/LaunchCatalogsNode.java
index a0c04a2f34..a0c04a2f34 100644
--- a/branches/sca-equinox/tutorials/store/domain/launch/LaunchCatalogsNode.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/launch/LaunchCatalogsNode.java
diff --git a/branches/sca-equinox/tutorials/store/domain/launch/LaunchCurrencyNode.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/launch/LaunchCurrencyNode.java
index d9110f5804..d9110f5804 100644
--- a/branches/sca-equinox/tutorials/store/domain/launch/LaunchCurrencyNode.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/launch/LaunchCurrencyNode.java
diff --git a/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreDBNode.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreDBNode.java
index b83db75646..b83db75646 100644
--- a/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreDBNode.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreDBNode.java
diff --git a/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreEUNode.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreEUNode.java
index de0e421e2d..de0e421e2d 100644
--- a/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreEUNode.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreEUNode.java
diff --git a/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreMarketNode.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreMarketNode.java
index b95d2a8d74..b95d2a8d74 100644
--- a/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreMarketNode.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreMarketNode.java
diff --git a/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreMashupNode.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreMashupNode.java
index aa7cbdc4ca..aa7cbdc4ca 100644
--- a/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreMashupNode.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreMashupNode.java
diff --git a/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreMergerNode.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreMergerNode.java
index a29c9b7d61..a29c9b7d61 100644
--- a/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreMergerNode.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreMergerNode.java
diff --git a/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreNode.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreNode.java
index 11f1b2ce86..11f1b2ce86 100644
--- a/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreNode.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreNode.java
diff --git a/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreSupplierNode.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreSupplierNode.java
index fce27d7d3b..fce27d7d3b 100644
--- a/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreSupplierNode.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/launch/LaunchStoreSupplierNode.java
diff --git a/branches/sca-equinox/tutorials/store/domain/launch/LaunchTutorialDomainManager.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/launch/LaunchTutorialDomainManager.java
index 7408e99c63..7408e99c63 100644
--- a/branches/sca-equinox/tutorials/store/domain/launch/LaunchTutorialDomainManager.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/launch/LaunchTutorialDomainManager.java
diff --git a/branches/sca-equinox/tutorials/store/domain/pom.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/pom.xml
index b36352cd43..b36352cd43 100644
--- a/branches/sca-equinox/tutorials/store/domain/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/pom.xml
diff --git a/branches/sca-equinox/tutorials/store/domain/workspace.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/workspace.xml
index 9cdbe04ac7..9cdbe04ac7 100644
--- a/branches/sca-equinox/tutorials/store/domain/workspace.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/domain/workspace.xml
diff --git a/branches/sca-equinox/tutorials/store/pom.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/pom.xml
index 4d7b23e211..4d7b23e211 100644
--- a/branches/sca-equinox/tutorials/store/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/pom.xml
diff --git a/branches/sca-equinox/tutorials/store/store-client/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-client/META-INF/sca-contribution.xml
index 30ffa61ed2..30ffa61ed2 100644
--- a/branches/sca-equinox/tutorials/store/store-client/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-client/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/tutorials/store/store-client/client/Shopper.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-client/client/Shopper.java
index f8643d4c52..f8643d4c52 100644
--- a/branches/sca-equinox/tutorials/store/store-client/client/Shopper.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-client/client/Shopper.java
diff --git a/branches/sca-equinox/tutorials/store/store-client/client/ShopperImpl.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-client/client/ShopperImpl.java
index c017548fb3..c017548fb3 100644
--- a/branches/sca-equinox/tutorials/store/store-client/client/ShopperImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-client/client/ShopperImpl.java
diff --git a/branches/sca-equinox/tutorials/store/store-client/launch/LaunchStoreClientNode.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-client/launch/LaunchStoreClientNode.java
index 5cb8ae90f9..5cb8ae90f9 100644
--- a/branches/sca-equinox/tutorials/store/store-client/launch/LaunchStoreClientNode.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-client/launch/LaunchStoreClientNode.java
diff --git a/branches/sca-equinox/tutorials/store/store-client/pom.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-client/pom.xml
index f106b6009e..f106b6009e 100644
--- a/branches/sca-equinox/tutorials/store/store-client/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-client/pom.xml
diff --git a/branches/sca-equinox/tutorials/store/store-client/services/Cart.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-client/services/Cart.java
index 9e6226d963..9e6226d963 100644
--- a/branches/sca-equinox/tutorials/store/store-client/services/Cart.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-client/services/Cart.java
diff --git a/branches/sca-equinox/tutorials/store/store-client/services/Catalog.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-client/services/Catalog.java
index 2c3b19f579..2c3b19f579 100644
--- a/branches/sca-equinox/tutorials/store/store-client/services/Catalog.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-client/services/Catalog.java
diff --git a/branches/sca-equinox/tutorials/store/store-client/services/Item.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-client/services/Item.java
index 81cefcdbef..81cefcdbef 100644
--- a/branches/sca-equinox/tutorials/store/store-client/services/Item.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-client/services/Item.java
diff --git a/branches/sca-equinox/tutorials/store/store-client/services/Total.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-client/services/Total.java
index 8f464e526f..8f464e526f 100644
--- a/branches/sca-equinox/tutorials/store/store-client/services/Total.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-client/services/Total.java
diff --git a/branches/sca-equinox/tutorials/store/store-client/store-client.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-client/store-client.composite
index 3c5f1637ef..3c5f1637ef 100644
--- a/branches/sca-equinox/tutorials/store/store-client/store-client.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-client/store-client.composite
diff --git a/branches/sca-equinox/tutorials/store/store-db/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-db/META-INF/sca-contribution.xml
index 7a5d5613be..7a5d5613be 100644
--- a/branches/sca-equinox/tutorials/store/store-db/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-db/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/tutorials/store/store-db/pom.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-db/pom.xml
index 5599180837..5599180837 100644
--- a/branches/sca-equinox/tutorials/store/store-db/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-db/pom.xml
diff --git a/branches/sca-equinox/tutorials/store/store-db/store-db.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-db/store-db.composite
index 03094be5ad..03094be5ad 100644
--- a/branches/sca-equinox/tutorials/store/store-db/store-db.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-db/store-db.composite
diff --git a/branches/sca-equinox/tutorials/store/store-eu/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-eu/META-INF/sca-contribution.xml
index 552932b0e7..552932b0e7 100644
--- a/branches/sca-equinox/tutorials/store/store-eu/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-eu/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/tutorials/store/store-eu/pom.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-eu/pom.xml
index f4ad1cd775..f4ad1cd775 100644
--- a/branches/sca-equinox/tutorials/store/store-eu/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-eu/pom.xml
diff --git a/branches/sca-equinox/tutorials/store/store-eu/store-eu.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-eu/store-eu.composite
index a0b8b50975..a0b8b50975 100644
--- a/branches/sca-equinox/tutorials/store/store-eu/store-eu.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-eu/store-eu.composite
diff --git a/branches/sca-equinox/tutorials/store/store-eu/uiservices/store-eu.html b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-eu/uiservices/store-eu.html
index 4569b76b3f..4569b76b3f 100644
--- a/branches/sca-equinox/tutorials/store/store-eu/uiservices/store-eu.html
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-eu/uiservices/store-eu.html
diff --git a/branches/sca-equinox/tutorials/store/store-market/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-market/META-INF/sca-contribution.xml
index 491230c952..491230c952 100644
--- a/branches/sca-equinox/tutorials/store/store-market/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-market/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/tutorials/store/store-market/build.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-market/build.xml
index 9244952305..9244952305 100644
--- a/branches/sca-equinox/tutorials/store/store-market/build.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-market/build.xml
diff --git a/branches/sca-equinox/tutorials/store/store-market/pom.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-market/pom.xml
index 1283770951..1283770951 100644
--- a/branches/sca-equinox/tutorials/store/store-market/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-market/pom.xml
diff --git a/branches/sca-equinox/tutorials/store/store-market/store-market.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-market/store-market.composite
index 1c225e6c07..1c225e6c07 100644
--- a/branches/sca-equinox/tutorials/store/store-market/store-market.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-market/store-market.composite
diff --git a/branches/sca-equinox/tutorials/store/store-mashup/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-mashup/META-INF/sca-contribution.xml
index 4ec08403e5..4ec08403e5 100644
--- a/branches/sca-equinox/tutorials/store/store-mashup/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-mashup/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/tutorials/store/store-mashup/build-openajax.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-mashup/build-openajax.xml
index 4668dedc1d..4668dedc1d 100644
--- a/branches/sca-equinox/tutorials/store/store-mashup/build-openajax.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-mashup/build-openajax.xml
diff --git a/branches/sca-equinox/tutorials/store/store-mashup/gadget/map-gadget.html b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-mashup/gadget/map-gadget.html
index d76bcad91b..d76bcad91b 100644
--- a/branches/sca-equinox/tutorials/store/store-mashup/gadget/map-gadget.html
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-mashup/gadget/map-gadget.html
diff --git a/branches/sca-equinox/tutorials/store/store-mashup/gadget/store-gadget.html b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-mashup/gadget/store-gadget.html
index c09b9d28c8..c09b9d28c8 100644
--- a/branches/sca-equinox/tutorials/store/store-mashup/gadget/store-gadget.html
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-mashup/gadget/store-gadget.html
diff --git a/branches/sca-equinox/tutorials/store/store-mashup/map-gadget.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-mashup/map-gadget.composite
index 77db2edbf2..77db2edbf2 100644
--- a/branches/sca-equinox/tutorials/store/store-mashup/map-gadget.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-mashup/map-gadget.composite
diff --git a/branches/sca-equinox/tutorials/store/store-mashup/mashup/store-mash.html b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-mashup/mashup/store-mash.html
index aab14bc065..aab14bc065 100644
--- a/branches/sca-equinox/tutorials/store/store-mashup/mashup/store-mash.html
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-mashup/mashup/store-mash.html
diff --git a/branches/sca-equinox/tutorials/store/store-mashup/pom.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-mashup/pom.xml
index 748dc1cece..748dc1cece 100644
--- a/branches/sca-equinox/tutorials/store/store-mashup/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-mashup/pom.xml
diff --git a/branches/sca-equinox/tutorials/store/store-mashup/store-gadget.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-mashup/store-gadget.composite
index 7c10651e52..7c10651e52 100644
--- a/branches/sca-equinox/tutorials/store/store-mashup/store-gadget.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-mashup/store-gadget.composite
diff --git a/branches/sca-equinox/tutorials/store/store-mashup/store-mashup.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-mashup/store-mashup.composite
index 84e4933e63..84e4933e63 100644
--- a/branches/sca-equinox/tutorials/store/store-mashup/store-mashup.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-mashup/store-mashup.composite
diff --git a/branches/sca-equinox/tutorials/store/store-merger/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-merger/META-INF/sca-contribution.xml
index 700a84736c..700a84736c 100644
--- a/branches/sca-equinox/tutorials/store/store-merger/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-merger/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/tutorials/store/store-merger/pom.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-merger/pom.xml
index 6e64c10c69..6e64c10c69 100644
--- a/branches/sca-equinox/tutorials/store/store-merger/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-merger/pom.xml
diff --git a/branches/sca-equinox/tutorials/store/store-merger/store-merger.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-merger/store-merger.composite
index 76d77dc693..76d77dc693 100644
--- a/branches/sca-equinox/tutorials/store/store-merger/store-merger.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-merger/store-merger.composite
diff --git a/branches/sca-equinox/tutorials/store/store-supplier/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-supplier/META-INF/sca-contribution.xml
index a75087aca1..a75087aca1 100644
--- a/branches/sca-equinox/tutorials/store/store-supplier/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-supplier/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/tutorials/store/store-supplier/pom.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-supplier/pom.xml
index 37bdb26de8..37bdb26de8 100644
--- a/branches/sca-equinox/tutorials/store/store-supplier/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-supplier/pom.xml
diff --git a/branches/sca-equinox/tutorials/store/store-supplier/store-supplier.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-supplier/store-supplier.composite
index 525bc889cb..525bc889cb 100644
--- a/branches/sca-equinox/tutorials/store/store-supplier/store-supplier.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-supplier/store-supplier.composite
diff --git a/branches/sca-equinox/tutorials/store/store-test/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-test/META-INF/sca-contribution.xml
index a75087aca1..a75087aca1 100644
--- a/branches/sca-equinox/tutorials/store/store-test/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-test/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/tutorials/store/store-test/client/Shopper.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-test/client/Shopper.java
index f8643d4c52..f8643d4c52 100644
--- a/branches/sca-equinox/tutorials/store/store-test/client/Shopper.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-test/client/Shopper.java
diff --git a/branches/sca-equinox/tutorials/store/store-test/pom.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-test/pom.xml
index b5db027f7b..b5db027f7b 100644
--- a/branches/sca-equinox/tutorials/store/store-test/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-test/pom.xml
diff --git a/branches/sca-equinox/tutorials/store/store-test/test/StoreSupplierTestCase.java b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-test/test/StoreSupplierTestCase.java
index 5efec4ee2c..5efec4ee2c 100644
--- a/branches/sca-equinox/tutorials/store/store-test/test/StoreSupplierTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store-test/test/StoreSupplierTestCase.java
diff --git a/branches/sca-equinox/tutorials/store/store/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/store/META-INF/sca-contribution.xml
index 3ed6e4a4ef..3ed6e4a4ef 100644
--- a/branches/sca-equinox/tutorials/store/store/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/tutorials/store/store/pom.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/store/pom.xml
index 993e0cd90b..993e0cd90b 100644
--- a/branches/sca-equinox/tutorials/store/store/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store/pom.xml
diff --git a/branches/sca-equinox/tutorials/store/store/store.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/store/store.composite
index b3f3140c8c..b3f3140c8c 100644
--- a/branches/sca-equinox/tutorials/store/store/store.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/store/store.composite
diff --git a/branches/sca-equinox/tutorials/store/web-services/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/web-services/META-INF/sca-contribution.xml
index 10fbe6c448..10fbe6c448 100644
--- a/branches/sca-equinox/tutorials/store/web-services/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/web-services/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/tutorials/store/web-services/catalogs.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/web-services/catalogs.composite
index 154d475165..154d475165 100644
--- a/branches/sca-equinox/tutorials/store/web-services/catalogs.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/web-services/catalogs.composite
diff --git a/branches/sca-equinox/tutorials/store/web-services/currency.composite b/sca-java-2.x/branches/sca-equinox/tutorials/store/web-services/currency.composite
index 7a3f70e299..7a3f70e299 100644
--- a/branches/sca-equinox/tutorials/store/web-services/currency.composite
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/web-services/currency.composite
diff --git a/branches/sca-equinox/tutorials/store/web-services/pom.xml b/sca-java-2.x/branches/sca-equinox/tutorials/store/web-services/pom.xml
index 992d9a62b6..992d9a62b6 100644
--- a/branches/sca-equinox/tutorials/store/web-services/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/tutorials/store/web-services/pom.xml
diff --git a/branches/sca-equinox/vtest/assembly/component/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/pom.xml
index eb36e4ba1e..eb36e4ba1e 100644
--- a/branches/sca-equinox/vtest/assembly/component/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/pom.xml
diff --git a/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
index 592020c180..592020c180 100644
--- a/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
diff --git a/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
index 0d95c8e4b8..0d95c8e4b8 100644
--- a/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
diff --git a/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
index c979c57f31..c979c57f31 100644
--- a/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
diff --git a/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java
index 8c0d08d052..8c0d08d052 100644
--- a/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
index 424e245fea..424e245fea 100644
--- a/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java
index b2b420ed6a..b2b420ed6a 100644
--- a/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java
diff --git a/branches/sca-equinox/vtest/assembly/component/src/main/resources/component.composite b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/resources/component.composite
index bb452feac9..bb452feac9 100644
--- a/branches/sca-equinox/vtest/assembly/component/src/main/resources/component.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/resources/component.composite
diff --git a/branches/sca-equinox/vtest/assembly/component/src/main/resources/nonuniquename.composite b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/resources/nonuniquename.composite
index 3019542091..3019542091 100644
--- a/branches/sca-equinox/vtest/assembly/component/src/main/resources/nonuniquename.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/resources/nonuniquename.composite
diff --git a/branches/sca-equinox/vtest/assembly/component/src/main/resources/serviceelement.composite b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/resources/serviceelement.composite
index 9460f5a2e1..9460f5a2e1 100644
--- a/branches/sca-equinox/vtest/assembly/component/src/main/resources/serviceelement.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/resources/serviceelement.composite
diff --git a/branches/sca-equinox/vtest/assembly/component/src/main/resources/servicewithbinding.composite b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/resources/servicewithbinding.composite
index 085d84f40e..085d84f40e 100644
--- a/branches/sca-equinox/vtest/assembly/component/src/main/resources/servicewithbinding.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/resources/servicewithbinding.composite
diff --git a/branches/sca-equinox/vtest/assembly/component/src/main/resources/servicewithinterface.composite b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/resources/servicewithinterface.composite
index cc915fbde5..cc915fbde5 100644
--- a/branches/sca-equinox/vtest/assembly/component/src/main/resources/servicewithinterface.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/resources/servicewithinterface.composite
diff --git a/branches/sca-equinox/vtest/assembly/component/src/main/resources/zerocomponents.composite b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/resources/zerocomponents.composite
index 6f02d7e941..6f02d7e941 100644
--- a/branches/sca-equinox/vtest/assembly/component/src/main/resources/zerocomponents.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/resources/zerocomponents.composite
diff --git a/branches/sca-equinox/vtest/assembly/component/src/main/resources/zeroimplelements.composite b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/resources/zeroimplelements.composite
index 8629f3817a..8629f3817a 100644
--- a/branches/sca-equinox/vtest/assembly/component/src/main/resources/zeroimplelements.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/main/resources/zeroimplelements.composite
diff --git a/branches/sca-equinox/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
index de4fbe39ce..de4fbe39ce 100644
--- a/branches/sca-equinox/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
diff --git a/branches/sca-equinox/vtest/assembly/ctypefile/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/assembly/ctypefile/pom.xml
index 0f28224746..0f28224746 100644
--- a/branches/sca-equinox/vtest/assembly/ctypefile/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/ctypefile/pom.xml
diff --git a/branches/sca-equinox/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
index d1df390ace..d1df390ace 100644
--- a/branches/sca-equinox/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
diff --git a/branches/sca-equinox/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
index 8ee18b242f..8ee18b242f 100644
--- a/branches/sca-equinox/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
diff --git a/branches/sca-equinox/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
index 0f24201970..0f24201970 100644
--- a/branches/sca-equinox/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
index fd32cb1f9b..fd32cb1f9b 100644
--- a/branches/sca-equinox/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType b/sca-java-2.x/branches/sca-equinox/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
index 173203ae21..173203ae21 100644
--- a/branches/sca-equinox/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
diff --git a/branches/sca-equinox/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType b/sca-java-2.x/branches/sca-equinox/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
index c6a0f274c4..c6a0f274c4 100644
--- a/branches/sca-equinox/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
diff --git a/branches/sca-equinox/vtest/assembly/ctypefile/src/main/resources/typefile.composite b/sca-java-2.x/branches/sca-equinox/vtest/assembly/ctypefile/src/main/resources/typefile.composite
index 889bb846ba..889bb846ba 100644
--- a/branches/sca-equinox/vtest/assembly/ctypefile/src/main/resources/typefile.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/ctypefile/src/main/resources/typefile.composite
diff --git a/branches/sca-equinox/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
index f8f7e45f61..f8f7e45f61 100644
--- a/branches/sca-equinox/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
diff --git a/branches/sca-equinox/vtest/assembly/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/assembly/pom.xml
index 457eb383a1..457eb383a1 100644
--- a/branches/sca-equinox/vtest/assembly/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/assembly/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversational/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversational/pom.xml
index 02bcfed38d..02bcfed38d 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversational/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversational/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java
index bc7212f70c..bc7212f70c 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java
index 76c857126a..76c857126a 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
index b67d89d3e2..b67d89d3e2 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
index 55d87c9546..55d87c9546 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
index 457b18e60a..457b18e60a 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
index d6252f0a0c..d6252f0a0c 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
index 4c2de35d52..4c2de35d52 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
index c00d5f1c10..c00d5f1c10 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/pom.xml
index de683c6c61..de683c6c61 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java
index a3f1f11826..a3f1f11826 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java
index 8a1ed23b9d..8a1ed23b9d 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java
index 1d215100f7..1d215100f7 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
index cd4f29ea5b..cd4f29ea5b 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
index 64b99c9f98..64b99c9f98 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
index 0d34b802e1..0d34b802e1 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
index 762c9533d0..762c9533d0 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java
index 3ebf63ba54..3ebf63ba54 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java
index 3820240ee2..3820240ee2 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java
index 75573b838d..75573b838d 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java
index 8349e775c5..8349e775c5 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
index 9d5aec8ed5..9d5aec8ed5 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
index 49391b3353..49391b3353 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
index d3573176a3..d3573176a3 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
index c10369c9bd..c10369c9bd 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java
index 570237ccf4..570237ccf4 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
index 4ebd667a00..4ebd667a00 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/destroy/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/pom.xml
index d6af9128e8..d6af9128e8 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/destroy/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
index 039689805c..039689805c 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
index 0b30bb8644..0b30bb8644 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
index 33b2e01bcb..33b2e01bcb 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
index d5630e859e..d5630e859e 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
index b8f384704a..b8f384704a 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
index 75a00447f3..75a00447f3 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
index b03a0defe5..b03a0defe5 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
diff --git a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
index 93aafdd971..93aafdd971 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
diff --git a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
index eb8f6e59ca..eb8f6e59ca 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
diff --git a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
index 296a386876..296a386876 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
diff --git a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
index 4373bc2558..4373bc2558 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
diff --git a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
index dba8072271..dba8072271 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/endsconversation/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/endsconversation/pom.xml
index 43691229eb..43691229eb 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/endsconversation/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/endsconversation/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java
index 13bcb1fd51..13bcb1fd51 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java
index 5400c1fe0d..5400c1fe0d 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
index ed564ddbdc..ed564ddbdc 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
index 418fb93c68..418fb93c68 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
index cbc13e380c..cbc13e380c 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
diff --git a/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
index 1ddd711a31..1ddd711a31 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/init/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/pom.xml
index ebbf50acdd..ebbf50acdd 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/init/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
index edf13010f5..edf13010f5 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
index 5d53510462..5d53510462 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
index 43c1a8cffa..43c1a8cffa 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java
index f5cac472c0..f5cac472c0 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
index b7c17ee535..b7c17ee535 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
index c2adea1426..c2adea1426 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
index 01b8e101e0..01b8e101e0 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
diff --git a/branches/sca-equinox/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
index 4ae38d44b6..4ae38d44b6 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
diff --git a/branches/sca-equinox/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
index 6bc3d8e7fc..6bc3d8e7fc 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
diff --git a/branches/sca-equinox/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
index 7ade16e6d3..7ade16e6d3 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
diff --git a/branches/sca-equinox/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
index 35f13a2ae6..35f13a2ae6 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
diff --git a/branches/sca-equinox/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
index 32af7c2cbd..32af7c2cbd 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/oneway/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/oneway/pom.xml
index 3ed248c805..3ed248c805 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/oneway/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/oneway/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java
index 6fef2afa2a..6fef2afa2a 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java
index 1cb4f3adf5..1cb4f3adf5 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java
index 4829ffb95f..4829ffb95f 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
index 09c783ae96..09c783ae96 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite
index 47a7a98c7d..47a7a98c7d 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite
diff --git a/branches/sca-equinox/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
index f2fb8d0dc8..f2fb8d0dc8 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/pom.xml
index d0443b6d70..d0443b6d70 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/annotations/property/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/pom.xml
index e803e99aa5..e803e99aa5 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/property/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java
index 5cfea1b099..5cfea1b099 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java
index 5ddc59f8b6..5ddc59f8b6 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java
index 99fb842a9a..99fb842a9a 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java
index 5de3b5fcff..5de3b5fcff 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java
index f30c4c69fc..f30c4c69fc 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
index b385083533..b385083533 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
index fd1ba5ee52..fd1ba5ee52 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java
index f22f4a35b7..f22f4a35b7 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
index 280d2275f8..280d2275f8 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
index 6bc4384e73..6bc4384e73 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
index 6715b64fad..6715b64fad 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
index e10f07b0be..e10f07b0be 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
index 9a23e2de8d..9a23e2de8d 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
index b4797595ac..b4797595ac 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/resources/property.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/resources/property.composite
index f7af170f33..f7af170f33 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/property/src/main/resources/property.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/main/resources/property.composite
diff --git a/branches/sca-equinox/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
index d5fbc568f7..d5fbc568f7 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/reference/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/reference/pom.xml
index 01e948217e..01e948217e 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/reference/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/reference/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
index b28704a3b4..b28704a3b4 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java
index 53b376d369..53b376d369 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
index 67299d322d..67299d322d 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
index a819dfd87d..a819dfd87d 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java
index e8611d510f..e8611d510f 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/resources/ab.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/resources/ab.composite
index b4ad1e77d5..b4ad1e77d5 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/resources/ab.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/reference/src/main/resources/ab.composite
diff --git a/branches/sca-equinox/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
index 1fe50b4ea7..1fe50b4ea7 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/pom.xml
index 8710e2453d..8710e2453d 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java
index b7cf3fba71..b7cf3fba71 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java
index 7da9d29424..7da9d29424 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java
index 208c6a78b0..208c6a78b0 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
index d4cedcc979..d4cedcc979 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
index 7844ba7b62..7844ba7b62 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
index 7a047414dc..7a047414dc 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java
index 555cdd5be0..555cdd5be0 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
index 79e20a3879..79e20a3879 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
index 95813f0e32..95813f0e32 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
index b4c95965ff..b4c95965ff 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java
index 5c0fc12fa3..5c0fc12fa3 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
index ab6a3f946a..ab6a3f946a 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
index c544bf6e02..c544bf6e02 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java
index 0104030f2e..0104030f2e 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java
index 9c17b06b16..9c17b06b16 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
index 2a8bd80e9a..2a8bd80e9a 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
index c99f5f5e74..c99f5f5e74 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
index cc41994106..cc41994106 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
index 4fb7386484..4fb7386484 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java
index 994469cb3a..994469cb3a 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
index 2fa610def7..2fa610def7 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
index 12566dc5e4..12566dc5e4 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
index a5851598a0..a5851598a0 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
index 7088562c57..7088562c57 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
index 274e0570d9..274e0570d9 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
index 681b0b3776..681b0b3776 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
index 98b94a33c7..98b94a33c7 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
index 8cf39a072c..8cf39a072c 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/resources/scope.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/resources/scope.composite
index 7c195b2b5d..7c195b2b5d 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/resources/scope.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/main/resources/scope.composite
diff --git a/branches/sca-equinox/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
index 6d65416ce8..6d65416ce8 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/pom.xml
index 3f6d52e85c..3f6d52e85c 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
index a923faf5ae..a923faf5ae 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java
index 26bcf3b9db..26bcf3b9db 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java
index 4f4f1e80c7..4f4f1e80c7 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java
index ffabb3619c..ffabb3619c 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java
index 83d7980dbc..83d7980dbc 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java
index a416e33de7..a416e33de7 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java
index ad44d2b93a..ad44d2b93a 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java
index 52886131a1..52886131a1 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java
index bd1a3a5fe6..bd1a3a5fe6 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java
index 0f8c7dabcb..0f8c7dabcb 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
index e50e230bd4..e50e230bd4 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java
index e3a1462f88..e3a1462f88 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java
index 0ab2e29194..0ab2e29194 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java
index 7ce2235719..7ce2235719 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
index 9c3f15743c..9c3f15743c 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java
index 3fc23d2f68..3fc23d2f68 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java
index 4cc9430c74..4cc9430c74 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java
index a64d434a46..a64d434a46 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java
index 49f34738ef..49f34738ef 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
index 46370b7e19..46370b7e19 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
index a86d6e1da0..a86d6e1da0 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
index ac525ea669..ac525ea669 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
index f2760b96ab..f2760b96ab 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/resources/service.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/resources/service.composite
index 0731986df2..0731986df2 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/main/resources/service.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/main/resources/service.composite
diff --git a/branches/sca-equinox/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java
index 52f7821ebb..52f7821ebb 100644
--- a/branches/sca-equinox/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/callablereference/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/callablereference/pom.xml
index 1aa72f7580..1aa72f7580 100644
--- a/branches/sca-equinox/vtest/java-api/apis/callablereference/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/callablereference/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java
index a3f6d48685..a3f6d48685 100644
--- a/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java
index 707568e507..707568e507 100644
--- a/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java
index 1a62b86c22..1a62b86c22 100644
--- a/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java
index 51ee68a393..51ee68a393 100644
--- a/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java
index f66db33a83..f66db33a83 100644
--- a/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite
index f997d78bb5..f997d78bb5 100644
--- a/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite
diff --git a/branches/sca-equinox/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java
index 4d0d8338ba..4d0d8338ba 100644
--- a/branches/sca-equinox/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/componentcontext/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/pom.xml
index 0b1941db0b..0b1941db0b 100644
--- a/branches/sca-equinox/vtest/java-api/apis/componentcontext/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java
index b2c8c07866..b2c8c07866 100644
--- a/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java
index 7e425c740f..7e425c740f 100644
--- a/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
index eff7cc5a88..eff7cc5a88 100644
--- a/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java
index d0da012f6f..d0da012f6f 100644
--- a/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
index a221ba11fc..a221ba11fc 100644
--- a/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
index 606443a480..606443a480 100644
--- a/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java
index 34a71e1318..34a71e1318 100644
--- a/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java
index 71d2eade2b..71d2eade2b 100644
--- a/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java
index 4b2c8c183b..4b2c8c183b 100644
--- a/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
index 19f110d5dc..19f110d5dc 100644
--- a/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
diff --git a/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
index 3f4150c64f..3f4150c64f 100644
--- a/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/conversation/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/conversation/pom.xml
index 1ca1a4b8a7..1ca1a4b8a7 100644
--- a/branches/sca-equinox/vtest/java-api/apis/conversation/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/conversation/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java
index 805c1f2750..805c1f2750 100644
--- a/branches/sca-equinox/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java
index abd8602705..abd8602705 100644
--- a/branches/sca-equinox/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java
index 616155ccdf..616155ccdf 100644
--- a/branches/sca-equinox/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java
index 66a3d3c72c..66a3d3c72c 100644
--- a/branches/sca-equinox/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/conversation/src/main/resources/conversation.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/conversation/src/main/resources/conversation.composite
index 87cab2f479..87cab2f479 100644
--- a/branches/sca-equinox/vtest/java-api/apis/conversation/src/main/resources/conversation.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/conversation/src/main/resources/conversation.composite
diff --git a/branches/sca-equinox/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java
index 9b46ac5e08..9b46ac5e08 100644
--- a/branches/sca-equinox/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/exception/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/pom.xml
index c74288de97..c74288de97 100644
--- a/branches/sca-equinox/vtest/java-api/apis/exception/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java
index 5c3755b19f..5c3755b19f 100644
--- a/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java
index c1c1c6544c..c1c1c6544c 100644
--- a/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java
index 6893a3b4b8..6893a3b4b8 100644
--- a/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java
index 519e66f1ce..519e66f1ce 100644
--- a/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java
index d0ef71a926..d0ef71a926 100644
--- a/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java
index 82873ed96d..82873ed96d 100644
--- a/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java
index b4d6e929c5..b4d6e929c5 100644
--- a/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java
index 245401e8aa..245401e8aa 100644
--- a/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java
index 2546548e1c..2546548e1c 100644
--- a/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java
index 1cbda7e10b..1cbda7e10b 100644
--- a/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/exception/src/main/resources/exception.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/main/resources/exception.composite
index 5bd933ce96..5bd933ce96 100644
--- a/branches/sca-equinox/vtest/java-api/apis/exception/src/main/resources/exception.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/main/resources/exception.composite
diff --git a/branches/sca-equinox/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java
index da7b1da0fa..da7b1da0fa 100644
--- a/branches/sca-equinox/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/pom.xml
index 19142d9df3..19142d9df3 100644
--- a/branches/sca-equinox/vtest/java-api/apis/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/apis/requestcontext/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/requestcontext/pom.xml
index deaaaf6e57..deaaaf6e57 100644
--- a/branches/sca-equinox/vtest/java-api/apis/requestcontext/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/requestcontext/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java
index 6fec5cada3..6fec5cada3 100644
--- a/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java
index 4dd2088f90..4dd2088f90 100644
--- a/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java
index 34f709d175..34f709d175 100644
--- a/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java
index c6fa589ed4..c6fa589ed4 100644
--- a/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java
index 33ff829357..33ff829357 100644
--- a/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite
index 4aa5eeb25a..4aa5eeb25a 100644
--- a/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite
diff --git a/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java
index e3b761bd37..e3b761bd37 100644
--- a/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/servicereference/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/servicereference/pom.xml
index 43758e0057..43758e0057 100644
--- a/branches/sca-equinox/vtest/java-api/apis/servicereference/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/servicereference/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java
index a1745f400e..a1745f400e 100644
--- a/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java
index f8c5c1272f..f8c5c1272f 100644
--- a/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java
index 33a4d6edcc..33a4d6edcc 100644
--- a/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java
index 28c90e2071..28c90e2071 100644
--- a/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java
index 545d037c53..545d037c53 100644
--- a/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java
index f4307667b6..f4307667b6 100644
--- a/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java
index 099655ea22..099655ea22 100644
--- a/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java
index ba3edf13ae..ba3edf13ae 100644
--- a/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java
diff --git a/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite
index 9bded61947..9bded61947 100644
--- a/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite
diff --git a/branches/sca-equinox/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java
index fda917d60a..fda917d60a 100644
--- a/branches/sca-equinox/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/pom.xml
index b8b70b360c..b8b70b360c 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
index e78736d4df..e78736d4df 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
index 0a90f9c99a..0a90f9c99a 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
index 0e61247294..0e61247294 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
index e317a6e7e0..e317a6e7e0 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java
index 6446e006bd..6446e006bd 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
index 15672f9ee0..15672f9ee0 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java
index 400c696d82..400c696d82 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java
index 33421cb4d0..33421cb4d0 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java
diff --git a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java
index 1b220abf69..1b220abf69 100644
--- a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java
index 957957a2e4..957957a2e4 100644
--- a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java
index 4ef741c1c1..4ef741c1c1 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java
index bba4bf2611..bba4bf2611 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java
index 4fb4fa53de..4fb4fa53de 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java
diff --git a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java
index 83453397b2..83453397b2 100644
--- a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java
index c165aa51da..c165aa51da 100644
--- a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java
index c0440a2b1b..c0440a2b1b 100644
--- a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java
index 8a237af0ad..8a237af0ad 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java
index 9c185ddee3..9c185ddee3 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java
diff --git a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java
index 2e79d135f4..2e79d135f4 100644
--- a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java
index fb0d6b8a50..fb0d6b8a50 100644
--- a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
index 1ace5858b2..1ace5858b2 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java
index 52d8fe5a7e..52d8fe5a7e 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java
index eea769b2fb..eea769b2fb 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java
index 1caa467348..1caa467348 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java
index a7f471aa26..a7f471aa26 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java
index 4aeeca6dc3..4aeeca6dc3 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java
index 014f1edd33..014f1edd33 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java
diff --git a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java
index 4e6dce6fb9..4e6dce6fb9 100644
--- a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java
index 2f560fe87b..2f560fe87b 100644
--- a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java
index 23e0d0e70b..23e0d0e70b 100644
--- a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java
index 705e101a01..705e101a01 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java
diff --git a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java
index c03b1aedc4..c03b1aedc4 100644
--- a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java
index 8e068c8be4..8e068c8be4 100644
--- a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java
index 16b2932afc..16b2932afc 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java
index 56b7006581..56b7006581 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java
index 580cf5a612..580cf5a612 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java
index 144492984a..144492984a 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java
diff --git a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java
index ce7214dba1..ce7214dba1 100644
--- a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java
index b61a15cbee..b61a15cbee 100644
--- a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java
index cb9aee2b9f..cb9aee2b9f 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java
index 1fe70344af..1fe70344af 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java
diff --git a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java
index 033fa9d097..033fa9d097 100644
--- a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java
index 5f7d8d9c94..5f7d8d9c94 100644
--- a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java
diff --git a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java
index 47d5d53821..47d5d53821 100644
--- a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java
diff --git a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java
index 18ce5edebe..18ce5edebe 100644
--- a/branches/sca-equinox/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/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
index 802c9c30db..802c9c30db 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
index e66ea5d537..e66ea5d537 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
index 4d93d2279d..4d93d2279d 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
index cd8c589a59..cd8c589a59 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite
index d2d9956103..d2d9956103 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
index 6c69330ce5..6c69330ce5 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
index 72c08e8344..72c08e8344 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
index 144f7f3d00..144f7f3d00 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
index ace06b245c..ace06b245c 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback.composite
index 4623f17ca2..4623f17ca2 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/main/resources/callback.composite
diff --git a/branches/sca-equinox/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
index dc681a4e7e..dc681a4e7e 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/id/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/id/pom.xml
index 4d77fcffe1..4d77fcffe1 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/id/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/id/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
index f49952828c..f49952828c 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
index d4641c5ee6..d4641c5ee6 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java
index 66a9b3b6c3..66a9b3b6c3 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java
index ac40c56ee6..ac40c56ee6 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
index 517976ff73..517976ff73 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
index 752476ebf7..752476ebf7 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java
index a01ceb7be4..a01ceb7be4 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
index 25e7154fca..25e7154fca 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
diff --git a/branches/sca-equinox/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
index d3cb107a61..d3cb107a61 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/lifetime/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/pom.xml
index ba7ed61732..ba7ed61732 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/lifetime/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java
index 8deef5df31..8deef5df31 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java
index 5a20f4d960..5a20f4d960 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java
index 6368b1157b..6368b1157b 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java
index ab186ee7eb..ab186ee7eb 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java
index dcc2e5d9c4..dcc2e5d9c4 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java
index 06d40accd4..06d40accd4 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java
index 56bfcabfc4..56bfcabfc4 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java
index 0919734c7a..0919734c7a 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java
index d9910d445c..d9910d445c 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java
index 34c57e402e..34c57e402e 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
index 21ee8acac1..21ee8acac1 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
diff --git a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java
index 987ac3539f..987ac3539f 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/parameters/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/parameters/pom.xml
index 063c246fd6..063c246fd6 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/parameters/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/parameters/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java
index bd19b504d9..bd19b504d9 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java
index 8a5ef43a4b..8a5ef43a4b 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java
index e9a6dc469d..e9a6dc469d 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java
index 0ef2f219f7..0ef2f219f7 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java
index ab0b05d163..ab0b05d163 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java
index 27d0210fca..27d0210fca 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite
index a8500dfb09..a8500dfb09 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite
diff --git a/branches/sca-equinox/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java
index 929fe06115..929fe06115 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java
diff --git a/branches/sca-equinox/vtest/java-api/conversation/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/pom.xml
index 3c5ccdfb9f..3c5ccdfb9f 100644
--- a/branches/sca-equinox/vtest/java-api/conversation/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/conversation/pom.xml
diff --git a/branches/sca-equinox/vtest/java-api/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/java-api/pom.xml
index 1e1c068983..1e1c068983 100644
--- a/branches/sca-equinox/vtest/java-api/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/java-api/pom.xml
diff --git a/branches/sca-equinox/vtest/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/pom.xml
index b7ce54142b..b7ce54142b 100644
--- a/branches/sca-equinox/vtest/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/pom.xml
diff --git a/branches/sca-equinox/vtest/processcomments.rb b/sca-java-2.x/branches/sca-equinox/vtest/processcomments.rb
index b7a7fc1cc3..b7a7fc1cc3 100644
--- a/branches/sca-equinox/vtest/processcomments.rb
+++ b/sca-java-2.x/branches/sca-equinox/vtest/processcomments.rb
diff --git a/branches/sca-equinox/vtest/utilities/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/utilities/pom.xml
index b079a0402c..b079a0402c 100644
--- a/branches/sca-equinox/vtest/utilities/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/utilities/pom.xml
diff --git a/branches/sca-equinox/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java b/sca-java-2.x/branches/sca-equinox/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java
index 9b6792e51b..9b6792e51b 100644
--- a/branches/sca-equinox/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/pom.xml
index 42b3f21da3..42b3f21da3 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/pom.xml
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/AService.java
index cba68beb65..cba68beb65 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/AService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/BService.java
index 43e35564b5..43e35564b5 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/BService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/CService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/CService.java
index 8838c07899..8838c07899 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/CService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/CService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/DService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/DService.java
index 27eee2de0a..27eee2de0a 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/DService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/DService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/AServiceImpl.java
index da767518ec..da767518ec 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/BServiceImpl.java
index 4402b76f3a..4402b76f3a 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/CServiceImpl.java
index 8392f5ed81..8392f5ed81 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/CServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/DServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/DServiceImpl.java
index 8064abf235..8064abf235 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/DServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/DServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite
index 39d66fa365..39d66fa365 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/NoWsdlDefaultBindingTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/NoWsdlDefaultBindingTestCase.java
index b50774cfa9..b50774cfa9 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/NoWsdlDefaultBindingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/NoWsdlDefaultBindingTestCase.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml
index a2d124eef1..a2d124eef1 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/AService.java
index 4acfc5ca3f..4acfc5ca3f 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/AService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/BService.java
index fa2f11b495..fa2f11b495 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/BService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/CService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/CService.java
index b55df2c0ae..b55df2c0ae 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/CService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/CService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/DService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/DService.java
index e39103a436..e39103a436 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/DService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/DService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/AServiceImpl.java
index 650d3295a6..650d3295a6 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/BServiceImpl.java
index 69d993251b..69d993251b 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/CServiceImpl.java
index ddcfc01416..ddcfc01416 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/CServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/DServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/DServiceImpl.java
index a3081b3bf4..a3081b3bf4 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/DServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/DServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite
index 8cd599354a..8cd599354a 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/GeneratedWSDLTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/GeneratedWSDLTestCase.java
index ae058cf6c9..ae058cf6c9 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/GeneratedWSDLTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/GeneratedWSDLTestCase.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/NoWsdlMultiSoapBindingsTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/NoWsdlMultiSoapBindingsTestCase.java
index 5dbb696bf5..5dbb696bf5 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/NoWsdlMultiSoapBindingsTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/NoWsdlMultiSoapBindingsTestCase.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/pom.xml
index 7e681df04a..7e681df04a 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/pom.xml
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/pom.xml
index 5d873553cc..5d873553cc 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/pom.xml
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java
index 6ab6fbb8f5..6ab6fbb8f5 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java
index f3c42008aa..f3c42008aa 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java
index 1215d9d41f..1215d9d41f 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java
index 774b68bf6d..774b68bf6d 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java
index 952df7ccfe..952df7ccfe 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java
index 9111b5c3a9..9111b5c3a9 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java
index 5aa508d8f1..5aa508d8f1 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java
index 055283bfad..055283bfad 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java
index 8f776672de..8f776672de 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java
index 7a5d91d762..7a5d91d762 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java
index 121de12d3c..121de12d3c 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java
index f05c8852f6..f05c8852f6 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java
index 746b0a357f..746b0a357f 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java
index 5be411b286..5be411b286 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite
index f79df5bf8f..f79df5bf8f 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java
index ae7dafa46e..ae7dafa46e 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java
index a4744b9007..a4744b9007 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/pom.xml
index 280011e217..280011e217 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/pom.xml
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/AService.java
index d5204634a6..d5204634a6 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/AService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BService.java
index 034aad7781..034aad7781 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP.java
index 1c345428b3..1c345428b3 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP11.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP11.java
index 74dcccd898..74dcccd898 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP11.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP11.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP12.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP12.java
index a86922ef4f..a86922ef4f 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP12.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP12.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/CService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/CService.java
index a809795657..a809795657 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/CService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/CService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/DService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/DService.java
index 2c1642ff14..2c1642ff14 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/DService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/DService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/AServiceImpl.java
index 657be52e7d..657be52e7d 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceImpl.java
index fb079fa8bc..fb079fa8bc 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP11Impl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP11Impl.java
index 9f0e76ec10..9f0e76ec10 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP11Impl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP11Impl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP12Impl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP12Impl.java
index 91e4ffbd7e..91e4ffbd7e 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP12Impl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP12Impl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAPImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAPImpl.java
index b8cd38bb09..b8cd38bb09 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAPImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAPImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/CServiceImpl.java
index 250694dc36..250694dc36 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/CServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/DServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/DServiceImpl.java
index 9f6c29c643..9f6c29c643 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/DServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/DServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite
index 61a658ab55..61a658ab55 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/GeneratedWSDLTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/GeneratedWSDLTestCase.java
index edd0d91072..edd0d91072 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/GeneratedWSDLTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/GeneratedWSDLTestCase.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlNoSoapVersionTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlNoSoapVersionTestCase.java
index 896b5a3d89..896b5a3d89 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlNoSoapVersionTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlNoSoapVersionTestCase.java
diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlSoapVersionTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlSoapVersionTestCase.java
index c65f7e8e52..c65f7e8e52 100644
--- a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlSoapVersionTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlSoapVersionTestCase.java
diff --git a/branches/sca-equinox/vtest/wsbinding/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/pom.xml
index 675879b785..675879b785 100644
--- a/branches/sca-equinox/vtest/wsbinding/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/pom.xml
diff --git a/branches/sca-equinox/vtest/wsbinding/service/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/pom.xml
index 34a2d553b0..34a2d553b0 100644
--- a/branches/sca-equinox/vtest/wsbinding/service/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/pom.xml
diff --git a/branches/sca-equinox/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AClientService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AClientService.java
index 397f6b4c5a..397f6b4c5a 100644
--- a/branches/sca-equinox/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AClientService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AClientService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AService.java
index b97e0cfebb..b97e0cfebb 100644
--- a/branches/sca-equinox/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AClientServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AClientServiceImpl.java
index 8d9e6de816..8d9e6de816 100644
--- a/branches/sca-equinox/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AClientServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AClientServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AServiceImpl.java
index 450da9cbcf..450da9cbcf 100644
--- a/branches/sca-equinox/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/aservice.wsdl b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/aservice.wsdl
index e7953eb2b4..e7953eb2b4 100644
--- a/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/aservice.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/aservice.wsdl
diff --git a/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite
index 0d92174442..0d92174442 100644
--- a/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite
diff --git a/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/endpointreference.composite b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/endpointreference.composite
index 3ba152b7b8..3ba152b7b8 100644
--- a/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/endpointreference.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/endpointreference.composite
diff --git a/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite
index 85c604070a..85c604070a 100644
--- a/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite
diff --git a/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite
index 0c11c79efe..0c11c79efe 100644
--- a/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite
diff --git a/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/wsdlport.composite b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/wsdlport.composite
index 859b93bec4..859b93bec4 100644
--- a/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/wsdlport.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/wsdlport.composite
diff --git a/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/wsdlservice.composite b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/wsdlservice.composite
index fa96e650de..fa96e650de 100644
--- a/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/wsdlservice.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/main/resources/wsdlservice.composite
diff --git a/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java
index d858daaf78..d858daaf78 100644
--- a/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java
diff --git a/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java
index 49f9db248f..49f9db248f 100644
--- a/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java
diff --git a/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java
index 292de8b654..292de8b654 100644
--- a/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java
diff --git a/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java
index 842da87bd4..842da87bd4 100644
--- a/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java
diff --git a/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java
index 0545cef776..0545cef776 100644
--- a/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java
diff --git a/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java
index aa2b2fac7a..aa2b2fac7a 100644
--- a/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/pom.xml
index 74884846bb..74884846bb 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/pom.xml
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/AService.java
index 49d12876e5..49d12876e5 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/AService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService.java
index b303f09dbc..b303f09dbc 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService2.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService2.java
index 7089663cf1..7089663cf1 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService2.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService2.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/CService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/CService.java
index 56f7415208..56f7415208 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/CService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/CService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/DService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/DService.java
index 90a78d3f0f..90a78d3f0f 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/DService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/DService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/AServiceImpl.java
index ce5adf2cc5..ce5adf2cc5 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BService2Impl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BService2Impl.java
index 4040108542..4040108542 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BService2Impl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BService2Impl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BServiceImpl.java
index 66c9cb4136..66c9cb4136 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/CServiceImpl.java
index ecdfbd59e2..ecdfbd59e2 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/CServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/DServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/DServiceImpl.java
index 06470f29f9..06470f29f9 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/DServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/DServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/resources/bservice.wsdl b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/resources/bservice.wsdl
index 8ce0fbaeb8..8ce0fbaeb8 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/resources/bservice.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/resources/bservice.wsdl
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/resources/cservice.wsdl b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/resources/cservice.wsdl
index ff151faa7a..ff151faa7a 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/resources/cservice.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/resources/cservice.wsdl
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite
index 6b97b5e602..6b97b5e602 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/WsdlElementBindingTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/WsdlElementBindingTestCase.java
index f30cf38654..f30cf38654 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/WsdlElementBindingTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/WsdlElementBindingTestCase.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/pom.xml
index 2ec122b984..2ec122b984 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/pom.xml
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/pom.xml
index 0560f085cd..0560f085cd 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/pom.xml
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/AService.java
index a0ed87249f..a0ed87249f 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/AService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService.java
index 1bdabeaea7..1bdabeaea7 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService2.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService2.java
index 3952d8c792..3952d8c792 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService2.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService2.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/CService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/CService.java
index 244907fa19..244907fa19 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/CService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/CService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/DService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/DService.java
index 519374c1bd..519374c1bd 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/DService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/DService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/AServiceImpl.java
index 558ddcbb49..558ddcbb49 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BService2Impl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BService2Impl.java
index b1dd73edc8..b1dd73edc8 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BService2Impl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BService2Impl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BServiceImpl.java
index b132fca45b..b132fca45b 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/CServiceImpl.java
index ca3ec62b83..ca3ec62b83 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/CServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/DServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/DServiceImpl.java
index 767deae23f..767deae23f 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/DServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/DServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/resources/bservice.wsdl b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/resources/bservice.wsdl
index d5c8d72dc1..d5c8d72dc1 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/resources/bservice.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/resources/bservice.wsdl
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/resources/cservice.wsdl b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/resources/cservice.wsdl
index 8a715a2081..8a715a2081 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/resources/cservice.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/resources/cservice.wsdl
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite
index 5b9b77683e..5b9b77683e 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/WsdlElementPortTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/WsdlElementPortTestCase.java
index 0db579002b..0db579002b 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/WsdlElementPortTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/WsdlElementPortTestCase.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/pom.xml b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/pom.xml
index a3d73a455f..a3d73a455f 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/pom.xml
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/AService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/AService.java
index 69b709ae95..69b709ae95 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/AService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/AService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService.java
index 852f36e0c1..852f36e0c1 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService2.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService2.java
index bfcacdaa21..bfcacdaa21 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService2.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService2.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/CService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/CService.java
index 5ceab40d0e..5ceab40d0e 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/CService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/CService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/DService.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/DService.java
index 5182ee3029..5182ee3029 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/DService.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/DService.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/AServiceImpl.java
index e89cf21215..e89cf21215 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/AServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BService2Impl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BService2Impl.java
index b8c23433eb..b8c23433eb 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BService2Impl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BService2Impl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BServiceImpl.java
index cbbf8222e6..cbbf8222e6 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/CServiceImpl.java
index 29a22f31bd..29a22f31bd 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/CServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/DServiceImpl.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/DServiceImpl.java
index 87654e7188..87654e7188 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/DServiceImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/DServiceImpl.java
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/resources/bservice.wsdl b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/resources/bservice.wsdl
index 521f077c46..521f077c46 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/resources/bservice.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/resources/bservice.wsdl
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/resources/cservice.wsdl b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/resources/cservice.wsdl
index bdf294b473..bdf294b473 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/resources/cservice.wsdl
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/resources/cservice.wsdl
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite
index 9801ecd037..9801ecd037 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite
diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/WsdlElementServiceTestCase.java b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/WsdlElementServiceTestCase.java
index 22d2a80244..22d2a80244 100644
--- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/WsdlElementServiceTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/WsdlElementServiceTestCase.java