5518 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/LICENSE
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/NOTICE
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/README
index 3ec27ef65f..3ec27ef65f 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/README
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/alert-aggregator.png b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/alert-aggregator.png
index ae429cca94..ae429cca94 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/alert-aggregator.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/alert-aggregator.png
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/alert-aggregator.svg b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/alert-aggregator.svg
index 807416135e..807416135e 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/alert-aggregator.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/alert-aggregator.svg
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/build-dojo.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/build-dojo.xml
index c31c9adee8..c31c9adee8 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/build-dojo.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/build-dojo.xml
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/build.xml
index 0faa0f7edd..0faa0f7edd 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/build.xml
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/pom.xml
index 8685bda446..8685bda446 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java
index 808374030c..808374030c 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java
index b062504311..b062504311 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java
index c4bf13ce7a..c4bf13ce7a 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java
index 28e27a9978..28e27a9978 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java
index 7b943b1b45..7b943b1b45 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java
index ca2fc95b4a..ca2fc95b4a 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java
index 2962defb25..2962defb25 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java
index 75544294ce..75544294ce 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java
index 2a5775e9a9..2a5775e9a9 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java
index 9b73a27625..9b73a27625 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java
index 10575bf0dc..10575bf0dc 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl
index 79b025bc73..79b025bc73 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/Alerts.xsd b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/Alerts.xsd
index f0ec561ad8..f0ec561ad8 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/Alerts.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/Alerts.xsd
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl
index 987481bd14..987481bd14 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/alerts-client.composite b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/alerts-client.composite
index 49f44f9da8..49f44f9da8 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/alerts-client.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/alerts-client.composite
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/alerts.composite b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/alerts.composite
index c359b275be..c359b275be 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/alerts.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/alerts.composite
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/sources.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/sources.xml
index 2168c10c9c..2168c10c9c 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/sources.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/resources/sources.xml
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/AlertAggregator.html b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/AlertAggregator.html
index 8b472fd0fa..8b472fd0fa 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/AlertAggregator.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/AlertAggregator.html
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 0bc67c4c98..0bc67c4c98 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 4bea6ec5ef..4bea6ec5ef 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
index a81165e1b4..a81165e1b4 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/pop.png b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/pop.png
index 1cf1df24a7..1cf1df24a7 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/pop.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/pop.png
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/rss.png b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/rss.png
index b3c949d224..b3c949d224 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/rss.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/rss.png
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/service.smd b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/service.smd
index bc77e39bf9..bc77e39bf9 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/service.smd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/service.smd
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/sources.smd b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/sources.smd
index b5f1824363..b5f1824363 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/sources.smd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/sources.smd
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/style.css b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/style.css
index f5bbf23379..f5bbf23379 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/style.css
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/main/webapp/style.css
diff --git a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
index 6e75ea0bdf..6e75ea0bdf 100644
--- a/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/LICENSE
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/NOTICE
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/README b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/README
index 5c0d850c5e..5c0d850c5e 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/README
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/bigbank.png b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/bigbank.png
index 985cc6bd05..985cc6bd05 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/bigbank.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/bigbank.png
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/bigbank.svg b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/bigbank.svg
index 0650075d48..0650075d48 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/bigbank.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/bigbank.svg
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/build-dojo.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/build-dojo.xml
index 9d282c2dd2..9d282c2dd2 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/build-dojo.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/build-dojo.xml
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/build.xml
index 7645080e8a..7645080e8a 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/build.xml
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/pom.xml
index 0b9d614475..0b9d614475 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/pom.xml
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountDetails.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
index 57c1adcba0..57c1adcba0 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java
index bf919525c4..bf919525c4 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
index 0ed4b1dd2e..0ed4b1dd2e 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountDetails.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
index cc9023da60..cc9023da60 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java
index 5bf6e6d26b..5bf6e6d26b 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
index 1f4f02ea6d..1f4f02ea6d 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
index 579b4ee64b..579b4ee64b 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
index 5c64e11d10..5c64e11d10 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
index c98dcacbf3..c98dcacbf3 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
index b6b8417045..b6b8417045 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
index c8b73d4ed4..c8b73d4ed4 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
index 5fecef691e..5fecef691e 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
index 419b5def58..419b5def58 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
index da1b6e1d06..da1b6e1d06 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountDetails.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountDetails.java
index 1473436000..1473436000 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountDetails.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountDetails.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java
index fcbf8a4831..fcbf8a4831 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
index 28101a1986..28101a1986 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/CheckingsAccount.composite b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/CheckingsAccount.composite
index cc76e30a75..cc76e30a75 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/CheckingsAccount.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/CheckingsAccount.composite
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml
index c5532b879d..c5532b879d 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 6491a0d326..6491a0d326 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index b1bce4339d..b1bce4339d 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index d6bfe2167e..d6bfe2167e 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/SavingsAccount.composite b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/SavingsAccount.composite
index 696b96d6e6..696b96d6e6 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/SavingsAccount.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/SavingsAccount.composite
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/StockAccount.composite b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/StockAccount.composite
index 62c0b63003..62c0b63003 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/StockAccount.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/StockAccount.composite
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/definitions.xml
index 31a8798f8b..31a8798f8b 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/web/AccountJSON.html b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/web/AccountJSON.html
index 1609bf4b43..1609bf4b43 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/web/AccountJSON.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/web/AccountJSON.html
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/web/style.css b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/web/style.css
index 1071583264..1071583264 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/web/style.css
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/web/style.css
diff --git a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl
index ac4d987a57..ac4d987a57 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-java-1.2.1/demos/bigbank-calculator/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-calculator/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/demos/bigbank-calculator/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-calculator/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/LICENSE
diff --git a/branches/sca-java-1.2.1/demos/bigbank-calculator/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-calculator/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/NOTICE
diff --git a/branches/sca-java-1.2.1/demos/bigbank-calculator/README b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/README
index e8ff28fc0f..e8ff28fc0f 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-calculator/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/README
diff --git a/branches/sca-java-1.2.1/demos/bigbank-calculator/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/build.xml
index d8f68a89c9..d8f68a89c9 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-calculator/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/build.xml
diff --git a/branches/sca-java-1.2.1/demos/bigbank-calculator/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/pom.xml
index 99f66c2ea1..99f66c2ea1 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-calculator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/pom.xml
diff --git a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/AddService.java
index 4eeb30a9c2..4eeb30a9c2 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index ed7bee0f4e..ed7bee0f4e 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/DivideService.java
index 131c5a8014..131c5a8014 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java
index a917896aeb..a917896aeb 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java
index e328f024ea..e328f024ea 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java
index b1861daafc..b1861daafc 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/resources/Calculator.composite
index 851813d31f..851813d31f 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
index 1d4d221364..1d4d221364 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
diff --git a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
index dd56af0ad8..dd56af0ad8 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
index 08fa310f46..08fa310f46 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/branches/sca-java-1.2.1/demos/bigbank-stockquote/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-stockquote/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/demos/bigbank-stockquote/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-stockquote/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/LICENSE
diff --git a/branches/sca-java-1.2.1/demos/bigbank-stockquote/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-stockquote/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/NOTICE
diff --git a/branches/sca-java-1.2.1/demos/bigbank-stockquote/README b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/README
index 2ea98d020c..2ea98d020c 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-stockquote/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/README
diff --git a/branches/sca-java-1.2.1/demos/bigbank-stockquote/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/build.xml
index 145c158ac2..145c158ac2 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-stockquote/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/build.xml
diff --git a/branches/sca-java-1.2.1/demos/bigbank-stockquote/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/pom.xml
index 51257dd205..51257dd205 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-stockquote/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/pom.xml
diff --git a/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/java/stockquote/PasswordCallbackHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/java/stockquote/PasswordCallbackHandler.java
index 2d7821171d..2d7821171d 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/java/stockquote/PasswordCallbackHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/java/stockquote/PasswordCallbackHandler.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java
index 2a0801f9b8..2a0801f9b8 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java
index 9d128657eb..9d128657eb 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java
index 04ed762602..04ed762602 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/resources/StockQuote.composite b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/resources/StockQuote.composite
index aaad92c861..aaad92c861 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/resources/StockQuote.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/resources/StockQuote.composite
diff --git a/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/resources/definitions.xml
index 7e1f51304e..7e1f51304e 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/resources/security.properties b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/resources/security.properties
index f33385f35a..f33385f35a 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/resources/security.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/resources/security.properties
diff --git a/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/resources/stockQuote.jks b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/resources/stockQuote.jks
index d53d32c4ef..d53d32c4ef 100644
--- a/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/resources/stockQuote.jks
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank-stockquote/src/main/resources/stockQuote.jks
diff --git a/branches/sca-java-1.2.1/demos/bigbank/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/DISCLAIMER
index 8e5c524323..8e5c524323 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/demos/bigbank/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/LICENSE
diff --git a/branches/sca-java-1.2.1/demos/bigbank/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/NOTICE
diff --git a/branches/sca-java-1.2.1/demos/bigbank/README b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/README
index 5ec796db60..5ec796db60 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/README
diff --git a/branches/sca-java-1.2.1/demos/bigbank/bigbank.png b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/bigbank.png
index 985cc6bd05..985cc6bd05 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/bigbank.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/bigbank.png
diff --git a/branches/sca-java-1.2.1/demos/bigbank/bigbank.svg b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/bigbank.svg
index 30aa0eab6d..30aa0eab6d 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/bigbank.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/bigbank.svg
diff --git a/branches/sca-java-1.2.1/demos/bigbank/build-dojo.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/build-dojo.xml
index 9d282c2dd2..9d282c2dd2 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/build-dojo.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/build-dojo.xml
diff --git a/branches/sca-java-1.2.1/demos/bigbank/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/build.xml
index 046aadd228..046aadd228 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/build.xml
diff --git a/branches/sca-java-1.2.1/demos/bigbank/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/pom.xml
index 557633feb3..557633feb3 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/pom.xml
diff --git a/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/account/AccountService.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/account/AccountService.java
index 2cb8027874..2cb8027874 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/account/AccountService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/account/AccountService.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
index 4f0e3879dc..4f0e3879dc 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java
index 8e8758de97..8e8758de97 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/client/BigBankClient.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/client/BigBankClient.java
index a7fa5ecc22..a7fa5ecc22 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/client/BigBankClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/client/BigBankClient.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/demo/BigBankServer.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/demo/BigBankServer.java
index 05360e07a5..05360e07a5 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/demo/BigBankServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/demo/BigBankServer.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/security/BigbankPasswordCallbackHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/security/BigbankPasswordCallbackHandler.java
index 6d3b547939..6d3b547939 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/security/BigbankPasswordCallbackHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/java/bigbank/security/BigbankPasswordCallbackHandler.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank/src/main/java/stockquote/StockQuoteService.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/java/stockquote/StockQuoteService.java
index 749b8ee2f4..749b8ee2f4 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/src/main/java/stockquote/StockQuoteService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/java/stockquote/StockQuoteService.java
diff --git a/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/BigBank.composite b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/BigBank.composite
index e57541b423..e57541b423 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/BigBank.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/BigBank.composite
diff --git a/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml
index 154992c843..154992c843 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/bigbank.jks b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/bigbank.jks
index e6294d85f7..e6294d85f7 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/bigbank.jks
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/bigbank.jks
diff --git a/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/definitions.xml
index 8654151d82..8654151d82 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/security.properties b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/security.properties
index bc17fefe57..bc17fefe57 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/security.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/security.properties
diff --git a/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/web/AccountJSON.html b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/web/AccountJSON.html
index 9f4368443f..9f4368443f 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/web/AccountJSON.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/web/AccountJSON.html
diff --git a/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/web/style.css b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/web/style.css
index 1071583264..1071583264 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/web/style.css
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/web/style.css
diff --git a/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/wsdl/AccountService.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/wsdl/AccountService.wsdl
index ac4d987a57..ac4d987a57 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-java-1.2.1/demos/bigbank/src/test/java/test/BigBankTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/test/java/test/BigBankTestCase.java
index 3b7c5ef2ad..3b7c5ef2ad 100644
--- a/branches/sca-java-1.2.1/demos/bigbank/src/test/java/test/BigBankTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/bigbank/src/test/java/test/BigBankTestCase.java
diff --git a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/LICENSE
diff --git a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/NOTICE
diff --git a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/README b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/README
index 27f140348c..27f140348c 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/README
diff --git a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/build.xml
index 59f1342276..59f1342276 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/build.xml
diff --git a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/pom.xml
index a032e74689..a032e74689 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/pom.xml
diff --git a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java
index ec95a60227..ec95a60227 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java
diff --git a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java
index f19e8a1250..f19e8a1250 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java
diff --git a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java
index 870ea1941d..870ea1941d 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java
diff --git a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite
index 5c828f5a39..5c828f5a39 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite
diff --git a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl
index 9c2acc96d3..9c2acc96d3 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl
diff --git a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml
index abf3fff629..abf3fff629 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml
index d7b2e32dd1..d7b2e32dd1 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/LICENSE
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/NOTICE
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/README b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/README
index 49dff6a6b4..49dff6a6b4 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/README
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/build.xml
index 9a0a83bf1d..9a0a83bf1d 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/build.xml
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/credit_composite.jpg b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/credit_composite.jpg
index e28ed63cfb..e28ed63cfb 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/credit_composite.jpg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/credit_composite.jpg
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/credit_composite.png b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/credit_composite.png
index 0bfce0078d..0bfce0078d 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/credit_composite.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/credit_composite.png
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/loan_approval.jpg b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/loan_approval.jpg
index 3f00557c7f..3f00557c7f 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/loan_approval.jpg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/loan_approval.jpg
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/loan_approval.png b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/loan_approval.png
index 9d5f829fe5..9d5f829fe5 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/loan_approval.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/loan_approval.png
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly0.jpg b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly0.jpg
index 515b6ecde7..515b6ecde7 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly0.jpg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly0.jpg
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly0.png b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly0.png
index 4b815a4b82..4b815a4b82 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly0.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly0.png
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly1.jpg b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly1.jpg
index 01a7c55a14..01a7c55a14 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly1.jpg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly1.jpg
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly1.png b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly1.png
index 07422c4f45..07422c4f45 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly1.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly1.png
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly2.jpg b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly2.jpg
index 992c048684..992c048684 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly2.jpg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly2.jpg
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly2.png b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly2.png
index 4667956ed0..4667956ed0 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly2.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_assembly2.png
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_composite.jpg b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_composite.jpg
index 5021f6a317..5021f6a317 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_composite.jpg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_composite.jpg
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_composite.png b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_composite.png
index 1398c50ded..1398c50ded 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_composite.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_composite.png
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_diagrams.doc b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_diagrams.doc
index 00d45e1084..00d45e1084 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_diagrams.doc
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_diagrams.doc
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_package1.jpg b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_package1.jpg
index e91c5f1bbd..e91c5f1bbd 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_package1.jpg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_package1.jpg
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_package1.png b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_package1.png
index db304a4c28..db304a4c28 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_package1.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_package1.png
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_package2.jpg b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_package2.jpg
index e8c2865e4a..e8c2865e4a 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_package2.jpg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_package2.jpg
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_package2.png b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_package2.png
index 502e538e94..502e538e94 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_package2.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_package2.png
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_scenario.jpg b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_scenario.jpg
index fccf2e35c3..fccf2e35c3 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_scenario.jpg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_scenario.jpg
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_scenario.png b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_scenario.png
index b8f42ad318..b8f42ad318 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_scenario.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/doc/mortgage_scenario.png
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/mortgage_assembly.png b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/mortgage_assembly.png
index 4667956ed0..4667956ed0 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/mortgage_assembly.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/mortgage_assembly.png
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/pom.xml
index 9673f49841..9673f49841 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/pom.xml
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java
index c5787b7819..c5787b7819 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java
index dc803d9688..dc803d9688 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java
index 66a486d516..66a486d516 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java
index b5bafeb204..b5bafeb204 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java
index 8c642667f1..8c642667f1 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java
index dcdad18496..dcdad18496 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java
index 40bfdc4a1d..40bfdc4a1d 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java
index cacd8694de..cacd8694de 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java
index 015f1bae98..015f1bae98 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java
index d69f0a1163..d69f0a1163 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java
index 23c9589e85..23c9589e85 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java
index c2116366ec..c2116366ec 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite
index d1128b9907..d1128b9907 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite
index 4cad6c7223..4cad6c7223 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType
index bf7b10e0f7..bf7b10e0f7 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js
index 1f8149b599..1f8149b599 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl
index 9c2acc96d3..9c2acc96d3 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl
diff --git a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java
index 285cc72515..285cc72515 100644
--- a/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java
diff --git a/branches/sca-java-1.2.1/demos/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/pom.xml
index 1bfab02a34..1bfab02a34 100644
--- a/branches/sca-java-1.2.1/demos/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/pom.xml
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/LICENSE
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/NOTICE
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/README b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/README
index af9d2ace3b..af9d2ace3b 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/README
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/build.xml
index 0ba1b069aa..0ba1b069aa 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/build.xml
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/pom.xml
index 1d7860fb61..1d7860fb61 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/pom.xml
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/AccountData.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/AccountData.java
index c3ae8d0912..c3ae8d0912 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/AccountData.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/AccountData.java
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java
index 1c0c612987..1c0c612987 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/AccountService.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/AccountService.java
index 4c72384e7b..4c72384e7b 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/AccountService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/AccountService.java
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java
index 2ce1e86062..2ce1e86062 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java
index a7703787fb..a7703787fb 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/BigBankServer.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/BigBankServer.java
index f5f1ca90b6..f5f1ca90b6 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/BigBankServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/BigBankServer.java
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java
index bb8ff85f45..bb8ff85f45 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/ExchangeRate.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/ExchangeRate.java
index 358e5e19a2..358e5e19a2 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/ExchangeRate.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/ExchangeRate.java
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java
index fcb3707cfe..fcb3707cfe 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java
index 26753a9e9e..26753a9e9e 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/StockValue.java b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/StockValue.java
index c300103398..c300103398 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/StockValue.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/java/bigbank/StockValue.java
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/resources/BigBank.composite b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/resources/BigBank.composite
index 8afde4bf80..8afde4bf80 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/resources/BigBank.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/resources/BigBank.composite
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/resources/accounts.xml b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/resources/accounts.xml
index 52ffd41fa7..52ffd41fa7 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/resources/accounts.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/resources/accounts.xml
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/resources/customer.xsd b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/resources/customer.xsd
index b22efb74c4..b22efb74c4 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/resources/customer.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/resources/customer.xsd
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/resources/stock.xq b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/resources/stock.xq
index 03c19e457d..03c19e457d 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/resources/stock.xq
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/resources/stock.xq
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl
index 8411e22ff7..8411e22ff7 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/xml-bigbank.png b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/xml-bigbank.png
index 0743a413a3..0743a413a3 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/xml-bigbank.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/xml-bigbank.png
diff --git a/branches/sca-java-1.2.1/demos/xml-bigbank/xml-bigbank.svg b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/xml-bigbank.svg
index c7acc03324..c7acc03324 100644
--- a/branches/sca-java-1.2.1/demos/xml-bigbank/xml-bigbank.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/demos/xml-bigbank/xml-bigbank.svg
diff --git a/branches/sca-java-1.2.1/distribution/bundle/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/distribution/bundle/pom.xml
index 9624c2c199..9624c2c199 100644
--- a/branches/sca-java-1.2.1/distribution/bundle/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/bundle/pom.xml
diff --git a/branches/sca-java-1.2.1/distribution/manifest/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/distribution/manifest/pom.xml
index cca6e455a4..cca6e455a4 100644
--- a/branches/sca-java-1.2.1/distribution/manifest/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/manifest/pom.xml
diff --git a/branches/sca-java-1.2.1/distribution/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/distribution/pom.xml
index 2cedcdf7b9..2cedcdf7b9 100644
--- a/branches/sca-java-1.2.1/distribution/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/pom.xml
diff --git a/branches/sca-java-1.2.1/distribution/src/main/assembly/bin.xml b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/assembly/bin.xml
index 2f043c667b..2f043c667b 100644
--- a/branches/sca-java-1.2.1/distribution/src/main/assembly/bin.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/assembly/bin.xml
diff --git a/branches/sca-java-1.2.1/distribution/src/main/assembly/src.xml b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/assembly/src.xml
index 77a7784ffe..77a7784ffe 100644
--- a/branches/sca-java-1.2.1/distribution/src/main/assembly/src.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/assembly/src.xml
diff --git a/branches/sca-java-1.2.1/distribution/src/main/release/CHANGES b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/release/CHANGES
index 5a40b9045e..5a40b9045e 100644
--- a/branches/sca-java-1.2.1/distribution/src/main/release/CHANGES
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/release/CHANGES
diff --git a/branches/sca-java-1.2.1/distribution/src/main/release/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-java-1.2.1/distribution/src/main/release/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/release/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/distribution/src/main/release/README b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/release/README
index e2aadcc64d..e2aadcc64d 100644
--- a/branches/sca-java-1.2.1/distribution/src/main/release/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/release/README
diff --git a/branches/sca-java-1.2.1/distribution/src/main/release/RELEASE_NOTES b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/release/RELEASE_NOTES
index 6e581fc41c..6e581fc41c 100644
--- a/branches/sca-java-1.2.1/distribution/src/main/release/RELEASE_NOTES
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-java-1.2.1/distribution/src/main/release/bin/INSTALL b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/release/bin/INSTALL
index 20733d559d..20733d559d 100644
--- a/branches/sca-java-1.2.1/distribution/src/main/release/bin/INSTALL
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/release/bin/INSTALL
diff --git a/branches/sca-java-1.2.1/distribution/src/main/release/bin/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/branches/sca-java-1.2.1/distribution/src/main/release/bin/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/release/bin/LICENSE
diff --git a/branches/sca-java-1.2.1/distribution/src/main/release/bin/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/branches/sca-java-1.2.1/distribution/src/main/release/bin/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/release/bin/NOTICE
diff --git a/branches/sca-java-1.2.1/distribution/src/main/release/src/BUILDING b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/release/src/BUILDING
index 1a23d33ffe..1a23d33ffe 100644
--- a/branches/sca-java-1.2.1/distribution/src/main/release/src/BUILDING
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/release/src/BUILDING
diff --git a/branches/sca-java-1.2.1/distribution/src/main/release/src/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/branches/sca-java-1.2.1/distribution/src/main/release/src/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/release/src/LICENSE
diff --git a/branches/sca-java-1.2.1/distribution/src/main/release/src/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/branches/sca-java-1.2.1/distribution/src/main/release/src/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/release/src/NOTICE
diff --git a/branches/sca-java-1.2.1/distribution/src/main/xsl/srcbuild_paths.xsl b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/xsl/srcbuild_paths.xsl
index ab7a40b94a..ab7a40b94a 100644
--- a/branches/sca-java-1.2.1/distribution/src/main/xsl/srcbuild_paths.xsl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/src/main/xsl/srcbuild_paths.xsl
diff --git a/branches/sca-java-1.2.1/distribution/standalone/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/distribution/standalone/pom.xml
index 82e3546505..82e3546505 100644
--- a/branches/sca-java-1.2.1/distribution/standalone/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/standalone/pom.xml
diff --git a/branches/sca-java-1.2.1/distribution/standalone/src/test/resources/repo/tuscany.properties b/sca-java-1.x/branches/sca-java-1.2.1/distribution/standalone/src/test/resources/repo/tuscany.properties
index a0d83168f7..a0d83168f7 100644
--- a/branches/sca-java-1.2.1/distribution/standalone/src/test/resources/repo/tuscany.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/standalone/src/test/resources/repo/tuscany.properties
diff --git a/branches/sca-java-1.2.1/distribution/tomcat/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/distribution/tomcat/pom.xml
index ed3ec9c396..ed3ec9c396 100644
--- a/branches/sca-java-1.2.1/distribution/tomcat/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/tomcat/pom.xml
diff --git a/branches/sca-java-1.2.1/distribution/tomcat/src/main/assembly/bin.xml b/sca-java-1.x/branches/sca-java-1.2.1/distribution/tomcat/src/main/assembly/bin.xml
index a664e719e9..a664e719e9 100644
--- a/branches/sca-java-1.2.1/distribution/tomcat/src/main/assembly/bin.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/tomcat/src/main/assembly/bin.xml
diff --git a/branches/sca-java-1.2.1/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties b/sca-java-1.x/branches/sca-java-1.2.1/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties
index 6e2ca20deb..6e2ca20deb 100644
--- a/branches/sca-java-1.2.1/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties
diff --git a/branches/sca-java-1.2.1/distribution/war/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/distribution/war/pom.xml
index 6ef000f0e3..6ef000f0e3 100644
--- a/branches/sca-java-1.2.1/distribution/war/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/war/pom.xml
diff --git a/branches/sca-java-1.2.1/distribution/war/src/main/release/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/distribution/war/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-java-1.2.1/distribution/war/src/main/release/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/war/src/main/release/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/distribution/war/src/main/release/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/distribution/war/src/main/release/LICENSE
index 815617a23b..815617a23b 100644
--- a/branches/sca-java-1.2.1/distribution/war/src/main/release/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/war/src/main/release/LICENSE
diff --git a/branches/sca-java-1.2.1/distribution/war/src/main/release/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/distribution/war/src/main/release/NOTICE
index c34934e5cd..c34934e5cd 100644
--- a/branches/sca-java-1.2.1/distribution/war/src/main/release/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/war/src/main/release/NOTICE
diff --git a/branches/sca-java-1.2.1/distribution/war/src/main/release/README b/sca-java-1.x/branches/sca-java-1.2.1/distribution/war/src/main/release/README
index 7c5ba2db37..7c5ba2db37 100644
--- a/branches/sca-java-1.2.1/distribution/war/src/main/release/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/war/src/main/release/README
diff --git a/branches/sca-java-1.2.1/distribution/war/src/main/webapp/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/distribution/war/src/main/webapp/web.xml
index 787ff847b0..787ff847b0 100644
--- a/branches/sca-java-1.2.1/distribution/war/src/main/webapp/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/war/src/main/webapp/web.xml
diff --git a/branches/sca-java-1.2.1/distribution/war/war.xml b/sca-java-1.x/branches/sca-java-1.2.1/distribution/war/war.xml
index 8fb1044714..8fb1044714 100644
--- a/branches/sca-java-1.2.1/distribution/war/war.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/war/war.xml
diff --git a/branches/sca-java-1.2.1/distribution/webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/distribution/webapp/pom.xml
index d415d0ab75..d415d0ab75 100644
--- a/branches/sca-java-1.2.1/distribution/webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java
index 9a0c66a776..9a0c66a776 100644
--- a/branches/sca-java-1.2.1/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java
diff --git a/branches/sca-java-1.2.1/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java b/sca-java-1.x/branches/sca-java-1.2.1/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java
index e46cadfa3d..e46cadfa3d 100644
--- a/branches/sca-java-1.2.1/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java
diff --git a/branches/sca-java-1.2.1/distribution/webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/distribution/webapp/src/main/webapp/WEB-INF/web.xml
index 8e65a9b96d..8e65a9b96d 100644
--- a/branches/sca-java-1.2.1/distribution/webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/distribution/webapp/src/main/webapp/sca-contributions/safeToDelete.tmp b/sca-java-1.x/branches/sca-java-1.2.1/distribution/webapp/src/main/webapp/sca-contributions/safeToDelete.tmp
index 4efe4b5db3..4efe4b5db3 100644
--- a/branches/sca-java-1.2.1/distribution/webapp/src/main/webapp/sca-contributions/safeToDelete.tmp
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/webapp/src/main/webapp/sca-contributions/safeToDelete.tmp
diff --git a/branches/sca-java-1.2.1/distribution/webapp/src/main/webapp/sca-contributions/sample-calculator-nodeB.jar b/sca-java-1.x/branches/sca-java-1.2.1/distribution/webapp/src/main/webapp/sca-contributions/sample-calculator-nodeB.jar
index 0df7ab8d74..0df7ab8d74 100644
--- a/branches/sca-java-1.2.1/distribution/webapp/src/main/webapp/sca-contributions/sample-calculator-nodeB.jar
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/webapp/src/main/webapp/sca-contributions/sample-calculator-nodeB.jar
diff --git a/branches/sca-java-1.2.1/distribution/webapp/src/main/webapp/sca-contributions/sample-helloworld-ws-service.jar b/sca-java-1.x/branches/sca-java-1.2.1/distribution/webapp/src/main/webapp/sca-contributions/sample-helloworld-ws-service.jar
index acf47451b3..acf47451b3 100644
--- a/branches/sca-java-1.2.1/distribution/webapp/src/main/webapp/sca-contributions/sample-helloworld-ws-service.jar
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/webapp/src/main/webapp/sca-contributions/sample-helloworld-ws-service.jar
diff --git a/branches/sca-java-1.2.1/distribution/webapp/src/main/webapp/scaDomainInfo.jsp b/sca-java-1.x/branches/sca-java-1.2.1/distribution/webapp/src/main/webapp/scaDomainInfo.jsp
index c92c164cfb..c92c164cfb 100644
--- a/branches/sca-java-1.2.1/distribution/webapp/src/main/webapp/scaDomainInfo.jsp
+++ b/sca-java-1.x/branches/sca-java-1.2.1/distribution/webapp/src/main/webapp/scaDomainInfo.jsp
diff --git a/branches/sca-java-1.2.1/itest/admin/README b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/README
index b89796f6e1..b89796f6e1 100644
--- a/branches/sca-java-1.2.1/itest/admin/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/README
diff --git a/branches/sca-java-1.2.1/itest/admin/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/pom.xml
index 10588e3595..10588e3595 100644
--- a/branches/sca-java-1.2.1/itest/admin/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java
index d307e0f9a2..d307e0f9a2 100644
--- a/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java
diff --git a/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java
index 143f860644..143f860644 100644
--- a/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java
diff --git a/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java
index 80f319f7c1..80f319f7c1 100644
--- a/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java
index f35a1a0000..f35a1a0000 100644
--- a/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java
diff --git a/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java
index 03a6b500d3..03a6b500d3 100644
--- a/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java
diff --git a/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java
index e03f8a0f55..e03f8a0f55 100644
--- a/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java
diff --git a/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java
index 8bbf9551f1..8bbf9551f1 100644
--- a/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java
index dc95879b22..dc95879b22 100644
--- a/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java
diff --git a/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java
index 314f7fa0c0..314f7fa0c0 100644
--- a/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java
index d278fff8aa..d278fff8aa 100644
--- a/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java
diff --git a/branches/sca-java-1.2.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java
index 65924cdd4f..65924cdd4f 100644
--- a/branches/sca-java-1.2.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
index 35065478f7..35065478f7 100644
--- a/branches/sca-java-1.2.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
index 22e60ddcd5..22e60ddcd5 100644
--- a/branches/sca-java-1.2.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/admin/src/test/resources/Iteration1Composite.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/test/resources/Iteration1Composite.composite
index 95dbbf0124..95dbbf0124 100644
--- a/branches/sca-java-1.2.1/itest/admin/src/test/resources/Iteration1Composite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/test/resources/Iteration1Composite.composite
diff --git a/branches/sca-java-1.2.1/itest/admin/src/test/resources/Iteration3Composite.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/test/resources/Iteration3Composite.composite
index dd06d030d6..dd06d030d6 100644
--- a/branches/sca-java-1.2.1/itest/admin/src/test/resources/Iteration3Composite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/test/resources/Iteration3Composite.composite
diff --git a/branches/sca-java-1.2.1/itest/admin/src/test/resources/MySimpleService.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/test/resources/MySimpleService.composite
index a1f8abb8da..a1f8abb8da 100644
--- a/branches/sca-java-1.2.1/itest/admin/src/test/resources/MySimpleService.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/admin/src/test/resources/MySimpleService.composite
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/pom.xml
index bf08786988..bf08786988 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
index 532b84bd22..532b84bd22 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
index 86d7f245e8..86d7f245e8 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
index 182d7c2c55..182d7c2c55 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestServer.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestServer.java
index 86e97361df..86e97361df 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestServer.java
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
index 672dbdc0b5..672dbdc0b5 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
index d7ebd5cbb8..d7ebd5cbb8 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
index 900f59ca9c..900f59ca9c 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
index fde89667cd..fde89667cd 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
index e768707ccd..e768707ccd 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml
index f6f9bbfc2e..f6f9bbfc2e 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
index d9b91ed8ba..d9b91ed8ba 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType
index de765c986f..de765c986f 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
index 7207398eba..7207398eba 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
index 0f51b96b27..0f51b96b27 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
index 6c7c7e7ab1..6c7c7e7ab1 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld/pom.xml
index 7ca5b77575..7ca5b77575 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
index ffdbc50a22..ffdbc50a22 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
index 76fcd35c2d..76fcd35c2d 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType
index 121064a475..121064a475 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
index f6b12fb14b..f6b12fb14b 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
index 610bda3cc4..610bda3cc4 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/log4j.properties
index d0b3c3aa5a..d0b3c3aa5a 100644
--- a/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/log4j.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/helloworld/src/test/resources/log4j.properties
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/pom.xml
index 94322a3638..94322a3638 100644
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/java/pingpong/BPELPingPongTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/java/pingpong/BPELPingPongTestCase.java
index 1ab2ba3d5d..1ab2ba3d5d 100644
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/java/pingpong/BPELPingPongTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/java/pingpong/BPELPingPongTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/java/pingpong/BPELPingTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/java/pingpong/BPELPingTestCase.java
index 34f82318a3..34f82318a3 100644
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/java/pingpong/BPELPingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/java/pingpong/BPELPingTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/java/pingpong/BPELPongTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/java/pingpong/BPELPongTestCase.java
index 313bd66850..313bd66850 100644
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/java/pingpong/BPELPongTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/java/pingpong/BPELPongTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/log4j.properties
index d0b3c3aa5a..d0b3c3aa5a 100644
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/log4j.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/log4j.properties
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.componentType
index e4cbdfe89c..e4cbdfe89c 100644
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.componentType
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.composite
index a0eb4d0b5b..a0eb4d0b5b 100644
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.composite
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/deploy.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/deploy.xml
index 613ed9c491..613ed9c491 100644
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/deploy.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/deploy.xml
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.bpel b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.bpel
index abda9e58d2..abda9e58d2 100644
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.bpel
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.bpel
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.componentType
index 7598a99d16..7598a99d16 100644
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.componentType
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.composite
index 75eed03022..75eed03022 100644
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.composite
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.wsdl
index 03e54c4de8..03e54c4de8 100644
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.wsdl
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/pong.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/pong.wsdl
index 1f4c4a9aaa..1f4c4a9aaa 100644
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/pong.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/pong.wsdl
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/deploy.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/deploy.xml
index 1315ef47f0..1315ef47f0 100644
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/deploy.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/deploy.xml
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.bpel b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.bpel
index b5d84898c7..b5d84898c7 100644
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.bpel
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.bpel
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.componentType
index 2f8fd5d3de..2f8fd5d3de 100644
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.componentType
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.composite
index e40ce7ee45..e40ce7ee45 100644
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.composite
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.wsdl
index 21ee8b82f6..21ee8b82f6 100644
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.wsdl
diff --git a/branches/sca-java-1.2.1/itest/bpel/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/pom.xml
index 69ff9f8e26..69ff9f8e26 100644
--- a/branches/sca-java-1.2.1/itest/bpel/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/bpel/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/build-was-integration.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/build-was-integration.xml
index 03de4c050f..03de4c050f 100644
--- a/branches/sca-java-1.2.1/itest/build-was-integration.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/build-was-integration.xml
diff --git a/branches/sca-java-1.2.1/itest/callablereferences-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/pom.xml
index 1595d3d393..1595d3d393 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
index e64ccd7cdf..e64ccd7cdf 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
index d3e19c413d..d3e19c413d 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
index db3e4a0a82..db3e4a0a82 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
index 25c4643ee4..25c4643ee4 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
index bb5e57397d..bb5e57397d 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
index 6e5f1cedf9..6e5f1cedf9 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
index 995e4fcf39..995e4fcf39 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
index be72fd779e..be72fd779e 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
index b73f26b573..b73f26b573 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
index c3abc4c65d..c3abc4c65d 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
index 3d782a0b84..3d782a0b84 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
diff --git a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/resources/example.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/resources/example.composite
index ea0819a32e..ea0819a32e 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/resources/example.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/main/resources/example.composite
diff --git a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
index 740af4f43d..740af4f43d 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
index 66fb2ef96c..66fb2ef96c 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/pom.xml
index d1ecc09ea2..d1ecc09ea2 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
index d6b3807d31..d6b3807d31 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
index 65c9bdad35..65c9bdad35 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
index ade672b0ab..ade672b0ab 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
index 518e77d3a8..518e77d3a8 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
index fdf80cc1c8..fdf80cc1c8 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
index cc8ec8f000..cc8ec8f000 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
index eb8cbbf280..eb8cbbf280 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
index 8117ed9235..8117ed9235 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
index ab21421c4d..ab21421c4d 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
index 5b5984b164..5b5984b164 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
index 223c467f47..223c467f47 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
index ed4e66bec3..ed4e66bec3 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
index e32051373f..e32051373f 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
index adf5a1c1ce..adf5a1c1ce 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
index 5b3add1e61..5b3add1e61 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/CallableReferenceTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
index 49b75f56e4..49b75f56e4 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
index facbe45f50..facbe45f50 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
index 95021f72a4..95021f72a4 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
index 2849400be4..2849400be4 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 2edda61601..2edda61601 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
index 3277c57616..3277c57616 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
index f2d8fe5d64..f2d8fe5d64 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
index 2b7750b443..2b7750b443 100644
--- a/branches/sca-java-1.2.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/callback-api/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-api/pom.xml
index 20cec68521..20cec68521 100644
--- a/branches/sca-java-1.2.1/itest/callback-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-api/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
index de17ba2f0d..de17ba2f0d 100644
--- a/branches/sca-java-1.2.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
diff --git a/branches/sca-java-1.2.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
index 5fd4a71466..5fd4a71466 100644
--- a/branches/sca-java-1.2.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
diff --git a/branches/sca-java-1.2.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
index 5accbe801d..5accbe801d 100644
--- a/branches/sca-java-1.2.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
index 33de1e7739..33de1e7739 100644
--- a/branches/sca-java-1.2.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
diff --git a/branches/sca-java-1.2.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
index 202d346b47..202d346b47 100644
--- a/branches/sca-java-1.2.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callback-api/src/main/resources/CallBackApiTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-api/src/main/resources/CallBackApiTest.composite
index 946c4862ee..946c4862ee 100644
--- a/branches/sca-java-1.2.1/itest/callback-api/src/main/resources/CallBackApiTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-api/src/main/resources/CallBackApiTest.composite
diff --git a/branches/sca-java-1.2.1/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
index 19eb25631e..19eb25631e 100644
--- a/branches/sca-java-1.2.1/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
index 9471049c74..9471049c74 100644
--- a/branches/sca-java-1.2.1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/callback-basic/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-basic/pom.xml
index a1e3f0b398..a1e3f0b398 100644
--- a/branches/sca-java-1.2.1/itest/callback-basic/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-basic/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
index 5e9d3d6821..5e9d3d6821 100644
--- a/branches/sca-java-1.2.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
diff --git a/branches/sca-java-1.2.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
index 9f4019f28c..9f4019f28c 100644
--- a/branches/sca-java-1.2.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
diff --git a/branches/sca-java-1.2.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
index 1bb2dc22b7..1bb2dc22b7 100644
--- a/branches/sca-java-1.2.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
index bd41fa7037..bd41fa7037 100644
--- a/branches/sca-java-1.2.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
diff --git a/branches/sca-java-1.2.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
index 4ca2dc9af9..4ca2dc9af9 100644
--- a/branches/sca-java-1.2.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
index c506956088..c506956088 100644
--- a/branches/sca-java-1.2.1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
diff --git a/branches/sca-java-1.2.1/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
index adf28214f6..adf28214f6 100644
--- a/branches/sca-java-1.2.1/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
index 32c26a348a..32c26a348a 100644
--- a/branches/sca-java-1.2.1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/callback-complex-type/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-complex-type/pom.xml
index 4a42b59b7b..4a42b59b7b 100644
--- a/branches/sca-java-1.2.1/itest/callback-complex-type/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-complex-type/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
index 9fddb850ba..9fddb850ba 100644
--- a/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
diff --git a/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
index 739983c277..739983c277 100644
--- a/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
diff --git a/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
index 188b1f2c01..188b1f2c01 100644
--- a/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
index ffbf4f35fa..ffbf4f35fa 100644
--- a/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
diff --git a/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
index dc31ed156b..dc31ed156b 100644
--- a/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
index 3f48f16389..3f48f16389 100644
--- a/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
diff --git a/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
index ff38134df5..ff38134df5 100644
--- a/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
diff --git a/branches/sca-java-1.2.1/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
index 33d1afaecd..33d1afaecd 100644
--- a/branches/sca-java-1.2.1/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
diff --git a/branches/sca-java-1.2.1/itest/callback-id/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-id/pom.xml
index 106fdce5ac..106fdce5ac 100644
--- a/branches/sca-java-1.2.1/itest/callback-id/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-id/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
index b14560a8c3..b14560a8c3 100644
--- a/branches/sca-java-1.2.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
diff --git a/branches/sca-java-1.2.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
index a9e551f8b4..a9e551f8b4 100644
--- a/branches/sca-java-1.2.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
diff --git a/branches/sca-java-1.2.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
index fef0eb50b8..fef0eb50b8 100644
--- a/branches/sca-java-1.2.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
index 18c592a1c1..18c592a1c1 100644
--- a/branches/sca-java-1.2.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
diff --git a/branches/sca-java-1.2.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
index 8b0a4b69cf..8b0a4b69cf 100644
--- a/branches/sca-java-1.2.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callback-id/src/main/resources/CallBackIdClient.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-id/src/main/resources/CallBackIdClient.composite
index c9a6ba6258..c9a6ba6258 100644
--- a/branches/sca-java-1.2.1/itest/callback-id/src/main/resources/CallBackIdClient.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-id/src/main/resources/CallBackIdClient.composite
diff --git a/branches/sca-java-1.2.1/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
index 771fbb8ff7..771fbb8ff7 100644
--- a/branches/sca-java-1.2.1/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/callback-multiple-wires/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-multiple-wires/pom.xml
index 4dcfd79fc9..4dcfd79fc9 100644
--- a/branches/sca-java-1.2.1/itest/callback-multiple-wires/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-multiple-wires/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
index 7c80d222fc..7c80d222fc 100644
--- a/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
diff --git a/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
index df91f3d268..df91f3d268 100644
--- a/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
diff --git a/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
index a0a9564002..a0a9564002 100644
--- a/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
diff --git a/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
index cfd601f546..cfd601f546 100644
--- a/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
diff --git a/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
index f198efae51..f198efae51 100644
--- a/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
diff --git a/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
index d19b3fe355..d19b3fe355 100644
--- a/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
index 3dae3ca3a8..3dae3ca3a8 100644
--- a/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
diff --git a/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
index 41ba766697..41ba766697 100644
--- a/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/callback-separatethread/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-separatethread/pom.xml
index bfa968a561..bfa968a561 100644
--- a/branches/sca-java-1.2.1/itest/callback-separatethread/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-separatethread/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
index f812a39058..f812a39058 100644
--- a/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
diff --git a/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
index e861f8a3d1..e861f8a3d1 100644
--- a/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
index ae41f596fc..ae41f596fc 100644
--- a/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
diff --git a/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
index c22b8cceec..c22b8cceec 100644
--- a/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
diff --git a/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
index a081f8866b..a081f8866b 100644
--- a/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
index e111e5074c..e111e5074c 100644
--- a/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
diff --git a/branches/sca-java-1.2.1/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
index f7e7be2133..f7e7be2133 100644
--- a/branches/sca-java-1.2.1/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/callback-set-callback/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-callback/pom.xml
index 0513f68393..0513f68393 100644
--- a/branches/sca-java-1.2.1/itest/callback-set-callback/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-callback/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
index 3b9599f53f..3b9599f53f 100644
--- a/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
diff --git a/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
index 48752f2ea1..48752f2ea1 100644
--- a/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
diff --git a/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
index ad0e0603a3..ad0e0603a3 100644
--- a/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
diff --git a/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
index 0a22b0e01f..0a22b0e01f 100644
--- a/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
index 94cb6aa73b..94cb6aa73b 100644
--- a/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
diff --git a/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
index ee14467de0..ee14467de0 100644
--- a/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
index afedcdf7f1..afedcdf7f1 100644
--- a/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
diff --git a/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
index 8093093968..8093093968 100644
--- a/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
index 3552ddecab..3552ddecab 100644
--- a/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
diff --git a/branches/sca-java-1.2.1/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
index 496ae0b1a5..496ae0b1a5 100644
--- a/branches/sca-java-1.2.1/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/callback-set-conversation/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-conversation/pom.xml
index c70b2969ba..c70b2969ba 100644
--- a/branches/sca-java-1.2.1/itest/callback-set-conversation/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-conversation/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
index eb840a006d..eb840a006d 100644
--- a/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
diff --git a/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
index a704fd0ece..a704fd0ece 100644
--- a/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
diff --git a/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
index 013424bf5e..013424bf5e 100644
--- a/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
diff --git a/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
index 475d7fc96d..475d7fc96d 100644
--- a/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
index 789e04e907..789e04e907 100644
--- a/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
diff --git a/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
index 9b998df045..9b998df045 100644
--- a/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
diff --git a/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
index 692b6dfc35..692b6dfc35 100644
--- a/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
diff --git a/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
index bca94ce407..bca94ce407 100644
--- a/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
index ce73417f94..ce73417f94 100644
--- a/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
diff --git a/branches/sca-java-1.2.1/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
index 45bdaea9ab..45bdaea9ab 100644
--- a/branches/sca-java-1.2.1/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/component-type/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/pom.xml
index b9630653d9..b9630653d9 100644
--- a/branches/sca-java-1.2.1/itest/component-type/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/CalculatorClient.java
index 08afd922b3..08afd922b3 100644
--- a/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
index f14ee506df..f14ee506df 100644
--- a/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/component-type/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/resources/Calculator.composite
index b229787657..b229787657 100644
--- a/branches/sca-java-1.2.1/itest/component-type/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.2.1/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
index 00c48e5a35..00c48e5a35 100644
--- a/branches/sca-java-1.2.1/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
diff --git a/branches/sca-java-1.2.1/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
index 74bedc0a98..74bedc0a98 100644
--- a/branches/sca-java-1.2.1/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
diff --git a/branches/sca-java-1.2.1/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
index 289fcc3e11..289fcc3e11 100644
--- a/branches/sca-java-1.2.1/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
diff --git a/branches/sca-java-1.2.1/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
index 2d8a879cda..2d8a879cda 100644
--- a/branches/sca-java-1.2.1/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
diff --git a/branches/sca-java-1.2.1/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
index 6214955141..6214955141 100644
--- a/branches/sca-java-1.2.1/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
diff --git a/branches/sca-java-1.2.1/itest/component-type/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
index 08fc8e33bf..08fc8e33bf 100644
--- a/branches/sca-java-1.2.1/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/build-jar.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/build-jar.xml
index 299ce6864f..299ce6864f 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/build-jar.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/build-jar.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/pom.xml
index 9f3b84ad7a..9f3b84ad7a 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
index 814c38777a..814c38777a 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index e4daf0ec02..e4daf0ec02 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
index e4b3bc7048..e4b3bc7048 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index 698aa2aa5d..698aa2aa5d 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 9e01f00a79..9e01f00a79 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index cdd12d589d..cdd12d589d 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
index 714d1826e1..714d1826e1 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
index 7f7dc969e2..7f7dc969e2 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
index 7f7dc969e2..7f7dc969e2 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
index 8a2bec308f..8a2bec308f 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
index c77c4c1c7e..c77c4c1c7e 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
index 210a68011f..210a68011f 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
index d118cceef9..d118cceef9 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
index d37b6659da..d37b6659da 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
index 77b28d9023..77b28d9023 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
index 8ec290a831..8ec290a831 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
index 1398416978..1398416978 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
index db1f0d34e7..db1f0d34e7 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
index 5be79b741a..5be79b741a 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
index a76fae8090..a76fae8090 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/pom.xml
index 0ee17cbae6..0ee17cbae6 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
index 5f92342b8c..5f92342b8c 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
index 05da52edc6..05da52edc6 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
index e0c11cdbee..e0c11cdbee 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-classloader/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/pom.xml
index c9ca36e531..c9ca36e531 100644
--- a/branches/sca-java-1.2.1/itest/contribution-classloader/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-classloader/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/pom.xml
index 597b7b3fa2..597b7b3fa2 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
index 669821261c..669821261c 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
index ff9f6e75f3..ff9f6e75f3 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
index bea6f39932..bea6f39932 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
index 636b7111d9..636b7111d9 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
index 44614f243a..44614f243a 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/pom.xml
index 9ef7139f3a..9ef7139f3a 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
index 7e11adcec7..7e11adcec7 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
index 5a14b41650..5a14b41650 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/pom.xml
index 129a06095f..129a06095f 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
index f11eacb416..f11eacb416 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
index 1ff281373a..1ff281373a 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/pom.xml
index 8586f9e81a..8586f9e81a 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
index 8254b667f2..8254b667f2 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
index 9b31363e1a..9b31363e1a 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
index d49e2ead99..d49e2ead99 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/pom.xml
index 3697a228d7..3697a228d7 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
index c062afaed0..c062afaed0 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
index 130aa91093..130aa91093 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
index 9b31363e1a..9b31363e1a 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
index d49e2ead99..d49e2ead99 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
index e2f852ff7e..e2f852ff7e 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
index 3cc6784eca..3cc6784eca 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/pom.xml
index 408807e5ea..408807e5ea 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
index be9bbc6cad..be9bbc6cad 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
index 9b650e4acc..9b650e4acc 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 9bc94525e0..9bc94525e0 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/pom.xml
index f775805b8d..f775805b8d 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
index ac6d7becb3..ac6d7becb3 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/main/resources/store.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/main/resources/store.composite
index bb5a7b764f..bb5a7b764f 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/main/resources/store.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/main/resources/store.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
index 1b7542b7d9..1b7542b7d9 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/pom.xml
index f4d03f0184..f4d03f0184 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
index a47b9a71e9..a47b9a71e9 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
index 5008a2ea5b..5008a2ea5b 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 66227eacaa..66227eacaa 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-import-export/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/pom.xml
index 5bc4bc57a7..5bc4bc57a7 100644
--- a/branches/sca-java-1.2.1/itest/contribution-import-export/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-import-export/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/pom.xml
index 15b4a2b79b..15b4a2b79b 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/hello/Hello.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/hello/Hello.java
index 313a58a0bf..313a58a0bf 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/hello/Hello.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/hello/Hello.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
index ff9f6e75f3..ff9f6e75f3 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
index c062afaed0..c062afaed0 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
index a84a578344..a84a578344 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
index ec5123eb2d..ec5123eb2d 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
index c1df23ce14..c1df23ce14 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
index 8b76783c3d..8b76783c3d 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
index aeeab337fa..aeeab337fa 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
index bfbf74373a..bfbf74373a 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
index 7a8003577e..7a8003577e 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
index bea6f39932..bea6f39932 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
index aeeab337fa..aeeab337fa 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
index bfbf74373a..bfbf74373a 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
index 45cb504ea4..45cb504ea4 100644
--- a/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/pom.xml
index bf9d32d8a7..bf9d32d8a7 100644
--- a/branches/sca-java-1.2.1/itest/contribution/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/AddService.java
index ff475408ef..ff475408ef 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorClient.java
index 616867ca31..616867ca31 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorService.java
index f25d66c80f..f25d66c80f 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/DivideService.java
index 709afc9460..709afc9460 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/MultiplyService.java
index 4a1d69d060..4a1d69d060 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/SubtractService.java
index f0caeafe7f..f0caeafe7f 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/resources/ContributionTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/resources/ContributionTest.composite
index d814e439e2..d814e439e2 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/resources/ContributionTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/resources/ContributionTest.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/resources/calculator/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/resources/calculator/Calculator.composite
index 657a2f95d8..657a2f95d8 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/resources/calculator/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/resources/calculator/Calculator.composite
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/main/resources/calculator/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/resources/calculator/sca-contribution.xml
index 2d5157cf57..2d5157cf57 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/main/resources/calculator/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/main/resources/calculator/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
index b26c9ad95e..b26c9ad95e 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar
diff --git a/branches/sca-java-1.2.1/itest/contribution/src/test/resources/repository/sample-calculator.jar b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/test/resources/repository/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-java-1.2.1/itest/contribution/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/contribution/src/test/resources/repository/sample-calculator.jar
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/pom.xml
index e7d13967ab..e7d13967ab 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
index 4f3a4573fc..4f3a4573fc 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
index 15c397b902..15c397b902 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
index b1dc926318..b1dc926318 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
index a5b7fd9e1a..a5b7fd9e1a 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
index 6f8d2d0b6f..6f8d2d0b6f 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
index 3a6f8fb97f..3a6f8fb97f 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
index 580c404448..580c404448 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
index 0db328b3d8..0db328b3d8 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
index a3b76352bd..a3b76352bd 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
index cffa76186a..cffa76186a 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
index a9d247ed40..a9d247ed40 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
index 0b50bae846..0b50bae846 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
index 31b2cc7849..31b2cc7849 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
index d5fe3bbb6c..d5fe3bbb6c 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
index 9895032f53..9895032f53 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
index d83cb65046..d83cb65046 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
index be1d4bc4d9..be1d4bc4d9 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
index 514880c37c..514880c37c 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
index 19724149a3..19724149a3 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
index 6ab5e554e4..6ab5e554e4 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
index 090e115fa6..090e115fa6 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/resources/Conversational/conversational.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
index b1885bd772..b1885bd772 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
index 20a92c9dc7..20a92c9dc7 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
index f4f0c1be7d..f4f0c1be7d 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
index 93bf866712..93bf866712 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
index 61b5892dc2..61b5892dc2 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCaseOff.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCaseOff.java
index f97a8689be..f97a8689be 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCaseOff.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCaseOff.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
index 2d7af475a7..2d7af475a7 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
index d3868ddaf4..d3868ddaf4 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
index 6fc0391b34..6fc0391b34 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
index 432039d15d..432039d15d 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
index 4db651a88a..4db651a88a 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
index 3846a8a38a..3846a8a38a 100644
--- a/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/pom.xml
index 6b748f14a0..6b748f14a0 100644
--- a/branches/sca-java-1.2.1/itest/conversations/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
index 46c5b9c857..46c5b9c857 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
index 2d88b697cc..2d88b697cc 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
index a6dbf56797..a6dbf56797 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
index e21b6f1ba7..e21b6f1ba7 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
index 15c397b902..15c397b902 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
index 5d7a72118f..5d7a72118f 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
index a5b7fd9e1a..a5b7fd9e1a 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
index 6f8d2d0b6f..6f8d2d0b6f 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
index d306c21209..d306c21209 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
index 7a2f30c7e6..7a2f30c7e6 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
index 74afbfb763..74afbfb763 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
index 83eb28dad8..83eb28dad8 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
index f3cb69275d..f3cb69275d 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
index ee242f7e7d..ee242f7e7d 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
index b21f956bd9..b21f956bd9 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
index 9deef312ac..9deef312ac 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
index cffa76186a..cffa76186a 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
index 1272c7ab7f..1272c7ab7f 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
index 6efb7f9a19..6efb7f9a19 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
index 43567d34e4..43567d34e4 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
index c5a0ceaaa9..c5a0ceaaa9 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
index 9895032f53..9895032f53 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
index c05124e441..c05124e441 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
index 1317219ff7..1317219ff7 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
index a547d2cb40..a547d2cb40 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
index b869c9f1e1..b869c9f1e1 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
index 205723315d..205723315d 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
index 8d79bb75e8..8d79bb75e8 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/resources/ConversationAge.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/resources/ConversationAge.composite
index abd1c35ced..abd1c35ced 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/resources/ConversationAge.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/resources/ConversationAge.composite
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/resources/conversationId.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/resources/conversationId.composite
index e61eb08194..e61eb08194 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/resources/conversationId.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/resources/conversationId.composite
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/resources/conversationLifetime.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/resources/conversationLifetime.composite
index 3b79dc43d9..3b79dc43d9 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/resources/conversationLifetime.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/resources/conversationLifetime.composite
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/main/resources/conversational.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/resources/conversational.composite
index 4da3ce74d5..4da3ce74d5 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/main/resources/conversational.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/main/resources/conversational.composite
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
index 3e750bdd1e..3e750bdd1e 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
index fffd146c38..fffd146c38 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
index cc31c77873..cc31c77873 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
index 8480e04028..8480e04028 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
diff --git a/branches/sca-java-1.2.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
index 37fd352325..37fd352325 100644
--- a/branches/sca-java-1.2.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/pom.xml
index b9e9fe59c2..b9e9fe59c2 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
index 1c1ba3660c..1c1ba3660c 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
index b2346aa973..b2346aa973 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
index 88616cc997..88616cc997 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
index b0e298b823..b0e298b823 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
index ee73db6152..ee73db6152 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
index 57827d27b9..57827d27b9 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
index 1fd7509667..1fd7509667 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/generate.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/generate.xsd
index 1fabedf55f..1fabedf55f 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/generate.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/generate/generate.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/wsdl/Dummy.txt b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
index 8927d725b6..8927d725b6 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Annotation.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Annotation.xml
index f1f4346e58..f1f4346e58 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Annotation.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Annotation.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Annotation.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
index 1fae43eb09..1fae43eb09 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Attribute.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Attribute.xml
index c20c80b658..c20c80b658 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Attribute.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Attribute.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Attribute.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
index bd3db2e030..bd3db2e030 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
index 30e4979dca..30e4979dca 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
index e7738dcff7..e7738dcff7 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
index 9552421e2d..9552421e2d 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
index c7b9655749..c7b9655749 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
index 5e5e7fbd55..5e5e7fbd55 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
index 5c455c2ab5..5c455c2ab5 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
index 635e851632..635e851632 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
index 004dab4fbb..004dab4fbb 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
index 136092951b..136092951b 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
index 796f08e1cf..796f08e1cf 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
index 927b94885c..927b94885c 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
index 93f83cd0a1..93f83cd0a1 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
index ea7db70595..ea7db70595 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
index c64323e7e1..c64323e7e1 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
index 85c7d85fd4..85c7d85fd4 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
index 543f276c50..543f276c50 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
index fcd281539b..fcd281539b 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
index 1610c2b861..1610c2b861 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
index 36a0760a61..36a0760a61 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
index 999b72bb35..999b72bb35 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
index 5849165fe0..5849165fe0 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
index 71dad561ca..71dad561ca 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
index 8acf9376d7..8acf9376d7 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
index a49987c352..a49987c352 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
index a35b6e174a..a35b6e174a 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
index e1995890f9..e1995890f9 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
index 91cfce51b8..91cfce51b8 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
index a2f86ba8c5..a2f86ba8c5 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
index 907474cd1b..907474cd1b 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
index a2f6bcfa77..a2f6bcfa77 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
index c5820e1a2e..c5820e1a2e 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
index f4d596bfe3..f4d596bfe3 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
index 0debe2fec5..0debe2fec5 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
index b5bcfdcfd4..b5bcfdcfd4 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
index 7f001254cc..7f001254cc 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
index 8d4d106f59..8d4d106f59 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
index f875b9f94d..f875b9f94d 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
index 4c8a39b06c..4c8a39b06c 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
index 7d343d6dda..7d343d6dda 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
index bb12bc04a9..bb12bc04a9 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
index 7a81f3b0dd..7a81f3b0dd 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
index f0e1c21233..f0e1c21233 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
index d35568b3c9..d35568b3c9 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
index 92bd9a4b66..92bd9a4b66 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
index 52cdfa8c4e..52cdfa8c4e 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
index 78d001a585..78d001a585 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
index 2609a858f7..2609a858f7 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
index 38f6c55059..38f6c55059 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
index 7868a47ca3..7868a47ca3 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
index 0d65b124ff..0d65b124ff 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
index 3f5080d49f..3f5080d49f 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
index 340555dc5f..340555dc5f 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
index 0deb7af980..0deb7af980 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
index 8059fe6da0..8059fe6da0 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
index 06c92ce19b..06c92ce19b 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
index 7b1f02d1d4..7b1f02d1d4 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
index 9bc0cefd0f..9bc0cefd0f 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
index 0c207983bc..0c207983bc 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
index f91b602f99..f91b602f99 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
index b99bf01b73..b99bf01b73 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
index c99698e175..c99698e175 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
index b5b9b0d1eb..b5b9b0d1eb 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
index 80d22ce057..80d22ce057 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
index 4902935db5..4902935db5 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
index 664bf824b4..664bf824b4 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
index 5d3658d224..5d3658d224 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
index c5861fa92a..c5861fa92a 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
index 0aa4710057..0aa4710057 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
index 1f95950394..1f95950394 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
index 6ee9c435db..6ee9c435db 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
index 0297f1aeb4..0297f1aeb4 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
index 56d027bdbb..56d027bdbb 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
index 81ba1069bd..81ba1069bd 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
index 866ab73024..866ab73024 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
index 8bb3a08b94..8bb3a08b94 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
index c7c62f812b..c7c62f812b 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
index 8235718c5e..8235718c5e 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
index 36caba2f16..36caba2f16 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
index 599c428a44..599c428a44 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
index 389d5a99f0..389d5a99f0 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
index 919c4a20ee..919c4a20ee 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
index 59887078b5..59887078b5 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
index 79011f26ab..79011f26ab 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
index 5de7d64d7b..5de7d64d7b 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
index c40be9e18b..c40be9e18b 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
index d4a78787b8..d4a78787b8 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
index c30434de66..c30434de66 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
index 5381590cd1..5381590cd1 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
index 4cd6ea7e72..4cd6ea7e72 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
index e8faf6225b..e8faf6225b 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
index b4375467c4..b4375467c4 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
index a4f564d9b7..a4f564d9b7 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
index d30ab85530..d30ab85530 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
index 8abb34b5a5..8abb34b5a5 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
index 7fd9a061ae..7fd9a061ae 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
index 1615976813..1615976813 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
index cd567ba528..cd567ba528 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
index 0beaac571f..0beaac571f 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
index 025362defb..025362defb 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
index d6d951fe5d..d6d951fe5d 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
index 5736a8c121..5736a8c121 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
index 242be1d53b..242be1d53b 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
index d728115a77..d728115a77 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
index 108e3a8619..108e3a8619 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
index d4ffae5e17..d4ffae5e17 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
index 5ee5e0229e..5ee5e0229e 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
index 3d5aed5aa8..3d5aed5aa8 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
index e7b80ab11c..e7b80ab11c 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
index 2b4fe5594e..2b4fe5594e 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
index fc4deb63c2..fc4deb63c2 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
index 03570f41d9..03570f41d9 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
index c754502645..c754502645 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
index 4603793bfc..4603793bfc 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
index 4bcd2f8c46..4bcd2f8c46 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
index a6861f803a..a6861f803a 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
index 8bb251cab2..8bb251cab2 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
index 467ec007ed..467ec007ed 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
index 8d00646678..8d00646678 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
index 7deafd798a..7deafd798a 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
index 72ac75fee0..72ac75fee0 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
index f6208f81b3..f6208f81b3 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
index 1f26e13673..1f26e13673 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
index 97de7b98eb..97de7b98eb 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
index 67716553d8..67716553d8 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
index 5941348921..5941348921 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
index 24d5d09054..24d5d09054 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
index f684d06a4d..f684d06a4d 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
index de4a8a666d..de4a8a666d 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
index 242908bd27..242908bd27 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
index 4c00fbe295..4c00fbe295 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
index 925e8625d5..925e8625d5 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
index b12bec040b..b12bec040b 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
index c73708ce46..c73708ce46 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
index 795c3ea7d9..795c3ea7d9 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
index 3ebdc89ae0..3ebdc89ae0 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
index 21546d0f67..21546d0f67 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
index 89657e42ca..89657e42ca 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
index d01b4172e4..d01b4172e4 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
index 82fd1eedaf..82fd1eedaf 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
index e1dcf06194..e1dcf06194 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
index ebf03c9d5d..ebf03c9d5d 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
index 8b9ba5b4b8..8b9ba5b4b8 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
index 26466b1b39..26466b1b39 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
index ff418c56ab..ff418c56ab 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
index 27bb1ce9cc..27bb1ce9cc 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
index 2bf1df8c99..2bf1df8c99 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
index 9b5561ed43..9b5561ed43 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
index 0b4e7bdf45..0b4e7bdf45 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
index f1b7cd264c..f1b7cd264c 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
index a2c8456257..a2c8456257 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
index 1f60b0423f..1f60b0423f 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
index 21e55ab8c1..21e55ab8c1 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
index 30762f4912..30762f4912 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
index 5bf35d0d70..5bf35d0d70 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
index 2dd01e4090..2dd01e4090 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
index 6920cd8dd0..6920cd8dd0 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
index 6a526bdc47..6a526bdc47 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
index 1117a95eb8..1117a95eb8 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
index ab91458bff..ab91458bff 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
index 3e015843b5..3e015843b5 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
index b6d68fd08a..b6d68fd08a 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
index d4453a4477..d4453a4477 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
index 6de3adc937..6de3adc937 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
index 786ab226da..786ab226da 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
index 64093aa803..64093aa803 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
index 01f4c2b1ef..01f4c2b1ef 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
index 774646f682..774646f682 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
index 34da37564c..34da37564c 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
index a1fb3aa803..a1fb3aa803 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
index 8eb7a4fce4..8eb7a4fce4 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
index f68eb1939d..f68eb1939d 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
index b9f77e6658..b9f77e6658 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Import.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Import.xml
index fd28850050..fd28850050 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Import.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Import.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Import.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Import.xsd
index eae93fd44a..eae93fd44a 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Import.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Import.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
index a7e568decf..a7e568decf 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Include.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Include.xml
index d4b9e24fa6..d4b9e24fa6 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Include.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Include.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Include.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Include.xsd
index 34ff314a19..34ff314a19 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Include.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Include.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Interop.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Interop.xsd
index ae22ab2c44..ae22ab2c44 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Interop.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Interop.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Notation.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Notation.xml
index b75ac6500a..b75ac6500a 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Notation.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Notation.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Notation.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Notation.xsd
index 6ad019cb81..6ad019cb81 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Notation.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Notation.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Person.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Person.xsd
index 5f5021b15e..5f5021b15e 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Person.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/Person.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
index 6c5ad88ff4..6c5ad88ff4 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
index 6b7e39b334..6b7e39b334 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
index f9d4a24a49..f9d4a24a49 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
index f649e2ba83..f649e2ba83 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
index 410df4b7e4..410df4b7e4 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
index 36629e8295..36629e8295 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
index 7b74867c03..7b74867c03 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
index 7a08de84be..7a08de84be 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
index 708d526f44..708d526f44 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
index 681cf7d5af..681cf7d5af 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
index e404ac86b7..e404ac86b7 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
index af0431f048..af0431f048 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
index c86a0f6bcb..c86a0f6bcb 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
index 89b00a36cc..89b00a36cc 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
index 399b0d8175..399b0d8175 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
index fee04b9f24..fee04b9f24 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
index bc8cf35368..bc8cf35368 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
index 536aa822de..536aa822de 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
index da2929776e..da2929776e 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
index ace5427786..ace5427786 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/datagraph.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
index e6b9697a8d..e6b9697a8d 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
index 7387568942..7387568942 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
index c5aabc9cc8..c5aabc9cc8 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
diff --git a/branches/sca-java-1.2.1/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
index fa3f310d4d..fa3f310d4d 100644
--- a/branches/sca-java-1.2.1/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/databindings/config.png b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/config.png
index 7912019e9d..7912019e9d 100644
--- a/branches/sca-java-1.2.1/itest/databindings/config.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/config.png
diff --git a/branches/sca-java-1.2.1/itest/databindings/config.svg b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/config.svg
index aaf027e2df..aaf027e2df 100644
--- a/branches/sca-java-1.2.1/itest/databindings/config.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/config.svg
diff --git a/branches/sca-java-1.2.1/itest/databindings/databinding.png b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/databinding.png
index 76a9c71b7d..76a9c71b7d 100644
--- a/branches/sca-java-1.2.1/itest/databindings/databinding.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/databinding.png
diff --git a/branches/sca-java-1.2.1/itest/databindings/databinding.svg b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/databinding.svg
index d6850ccf7d..d6850ccf7d 100644
--- a/branches/sca-java-1.2.1/itest/databindings/databinding.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/databinding.svg
diff --git a/branches/sca-java-1.2.1/itest/databindings/interop.png b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/interop.png
index 005e0f24ea..005e0f24ea 100644
--- a/branches/sca-java-1.2.1/itest/databindings/interop.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/interop.png
diff --git a/branches/sca-java-1.2.1/itest/databindings/interop.svg b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/interop.svg
index 03897c6d09..03897c6d09 100644
--- a/branches/sca-java-1.2.1/itest/databindings/interop.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/interop.svg
diff --git a/branches/sca-java-1.2.1/itest/databindings/interop/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/interop/pom.xml
index f6685957cf..f6685957cf 100644
--- a/branches/sca-java-1.2.1/itest/databindings/interop/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/interop/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
index 7bdfc57924..7bdfc57924 100644
--- a/branches/sca-java-1.2.1/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
diff --git a/branches/sca-java-1.2.1/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
index 38bfccce0c..38bfccce0c 100644
--- a/branches/sca-java-1.2.1/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
diff --git a/branches/sca-java-1.2.1/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
index 6f02af4c9d..6f02af4c9d 100644
--- a/branches/sca-java-1.2.1/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
diff --git a/branches/sca-java-1.2.1/itest/databindings/interop/src/main/resources/generate/generate.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/interop/src/main/resources/generate/generate.xml
index 8453dd56b4..8453dd56b4 100644
--- a/branches/sca-java-1.2.1/itest/databindings/interop/src/main/resources/generate/generate.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/interop/src/main/resources/generate/generate.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
index 36797fde57..36797fde57 100644
--- a/branches/sca-java-1.2.1/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
diff --git a/branches/sca-java-1.2.1/itest/databindings/jaxbgen/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/jaxbgen/pom.xml
index 0dc2ec329d..0dc2ec329d 100644
--- a/branches/sca-java-1.2.1/itest/databindings/jaxbgen/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/jaxbgen/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
index 8381a164ea..8381a164ea 100644
--- a/branches/sca-java-1.2.1/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/jaxbgen/src/main/resources/greeter.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/jaxbgen/src/main/resources/greeter.composite
index ae0740e6fe..ae0740e6fe 100644
--- a/branches/sca-java-1.2.1/itest/databindings/jaxbgen/src/main/resources/greeter.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/jaxbgen/src/main/resources/greeter.composite
diff --git a/branches/sca-java-1.2.1/itest/databindings/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/pom.xml
index 21638d0073..21638d0073 100644
--- a/branches/sca-java-1.2.1/itest/databindings/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/readme.html b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/readme.html
index 24a44e4ed7..24a44e4ed7 100644
--- a/branches/sca-java-1.2.1/itest/databindings/readme.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/readme.html
diff --git a/branches/sca-java-1.2.1/itest/databindings/sdogen/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/sdogen/pom.xml
index 51b596c210..51b596c210 100644
--- a/branches/sca-java-1.2.1/itest/databindings/sdogen/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/sdogen/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/sdogen/src/main/resources/generate/generate.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/sdogen/src/main/resources/generate/generate.xml
index 3f9926604d..3f9926604d 100644
--- a/branches/sca-java-1.2.1/itest/databindings/sdogen/src/main/resources/generate/generate.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/sdogen/src/main/resources/generate/generate.xml
diff --git a/branches/sca-java-1.2.1/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
index 9494d70f96..9494d70f96 100644
--- a/branches/sca-java-1.2.1/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
diff --git a/branches/sca-java-1.2.1/itest/domain/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/pom.xml
index 1e09f73972..1e09f73972 100644
--- a/branches/sca-java-1.2.1/itest/domain/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddService.java
index d7dc4473ad..d7dc4473ad 100644
--- a/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddServiceImpl.java
index e9b7e254e5..e9b7e254e5 100644
--- a/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java
index 5b63ad5a17..5b63ad5a17 100644
--- a/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java
diff --git a/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/CalculatorService.java
index 5fbd3a3f6b..5fbd3a3f6b 100644
--- a/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
index da869e00fd..da869e00fd 100644
--- a/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/SubtractService.java
index 78ab9c6ee0..78ab9c6ee0 100644
--- a/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/SubtractServiceImpl.java
index 1010207154..1010207154 100644
--- a/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionA/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionA/Calculator.composite
index 534e1a29af..534e1a29af 100644
--- a/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionA/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionA/Calculator.composite
diff --git a/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
index db255e0232..db255e0232 100644
--- a/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
index bdb89803d1..bdb89803d1 100644
--- a/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
diff --git a/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionBupdate/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionBupdate/META-INF/sca-deployables/Calculator.composite
index 0c8d3e2858..0c8d3e2858 100644
--- a/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionBupdate/META-INF/sca-deployables/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionBupdate/META-INF/sca-deployables/Calculator.composite
diff --git a/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
index c5af8dd3cc..c5af8dd3cc 100644
--- a/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
diff --git a/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionD/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionD/META-INF/sca-deployables/Calculator.composite
index 119c52cbf8..119c52cbf8 100644
--- a/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionD/META-INF/sca-deployables/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionD/META-INF/sca-deployables/Calculator.composite
diff --git a/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionDependent/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionDependent/Calculator.composite
index 538ad2e4c8..538ad2e4c8 100644
--- a/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionDependent/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionDependent/Calculator.composite
diff --git a/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
index 673de80c44..673de80c44 100644
--- a/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionPrimary/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
index c120fed3ca..c120fed3ca 100644
--- a/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
diff --git a/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
index 392310da11..392310da11 100644
--- a/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/DomainAPITestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/DomainAPITestCase.java
index 0fe2cf53d6..0fe2cf53d6 100644
--- a/branches/sca-java-1.2.1/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/DomainAPITestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/DomainAPITestCase.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/pom.xml
index 551fb4c71c..551fb4c71c 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
index 4f4fe50041..4f4fe50041 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
index 95496e1737..95496e1737 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
index 842dd4e602..842dd4e602 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
index 74815dc6c1..74815dc6c1 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
index aba83723bb..aba83723bb 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
index ab65efbb58..ab65efbb58 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
index acecdff613..acecdff613 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
index 460edab182..460edab182 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
index 40e87953b6..40e87953b6 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
index 9759647cfe..9759647cfe 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
index fc49fa1d7d..fc49fa1d7d 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/pom.xml
index 77329204dc..77329204dc 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
index f5e36db7cd..f5e36db7cd 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
index 65751175fb..65751175fb 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
index 5f65d293ea..5f65d293ea 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
index e84ae633e7..e84ae633e7 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
index 74815dc6c1..74815dc6c1 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
index 5fe40935ec..5fe40935ec 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
index ab65efbb58..ab65efbb58 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
index 872fd721d1..872fd721d1 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
index 83526cb6a1..83526cb6a1 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
index d70cdad313..d70cdad313 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
index 33b830c856..33b830c856 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
index 9759647cfe..9759647cfe 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
diff --git a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
index 3371f63e4a..3371f63e4a 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions-simple-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-simple-ws/pom.xml
index 3d2da4f0b7..3d2da4f0b7 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-simple-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-simple-ws/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
index 764f31b7cd..764f31b7cd 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
index 0c72b52ed9..0c72b52ed9 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
index d6545b5a23..d6545b5a23 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
index 30ea559694..30ea559694 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
index b3b6f033e5..b3b6f033e5 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/resources/example.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/resources/example.composite
index 8c33a22e58..8c33a22e58 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/resources/example.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/resources/example.composite
diff --git a/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
index 04a061d5e5..04a061d5e5 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
diff --git a/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
index 740af4f43d..740af4f43d 100644
--- a/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/pom.xml
index 19926c4dfa..19926c4dfa 100644
--- a/branches/sca-java-1.2.1/itest/exceptions/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
index b95b0ccb31..b95b0ccb31 100644
--- a/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
index 5740e053a9..5740e053a9 100644
--- a/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
index f923133ee9..f923133ee9 100644
--- a/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
index 55d81102d2..55d81102d2 100644
--- a/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
index 453528444d..453528444d 100644
--- a/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
index 1987490a0a..1987490a0a 100644
--- a/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
index c4cb52f94c..c4cb52f94c 100644
--- a/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
index cf8740ba56..cf8740ba56 100644
--- a/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
index f82a30d529..f82a30d529 100644
--- a/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
diff --git a/branches/sca-java-1.2.1/itest/exceptions/src/main/resources/ExceptionTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/src/main/resources/ExceptionTest.composite
index d27797c2fe..d27797c2fe 100644
--- a/branches/sca-java-1.2.1/itest/exceptions/src/main/resources/ExceptionTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/src/main/resources/ExceptionTest.composite
diff --git a/branches/sca-java-1.2.1/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
index 594588930e..594588930e 100644
--- a/branches/sca-java-1.2.1/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/extended-api/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/extended-api/pom.xml
index 0ff4050e74..0ff4050e74 100644
--- a/branches/sca-java-1.2.1/itest/extended-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/extended-api/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
index 869565af17..869565af17 100644
--- a/branches/sca-java-1.2.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
diff --git a/branches/sca-java-1.2.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
index c54af93c05..c54af93c05 100644
--- a/branches/sca-java-1.2.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
diff --git a/branches/sca-java-1.2.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
index 523d238f2e..523d238f2e 100644
--- a/branches/sca-java-1.2.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
index ab4300a7dd..ab4300a7dd 100644
--- a/branches/sca-java-1.2.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/extended-api/src/main/resources/BasicService.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/extended-api/src/main/resources/BasicService.composite
index 128b33b16f..128b33b16f 100644
--- a/branches/sca-java-1.2.1/itest/extended-api/src/main/resources/BasicService.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/extended-api/src/main/resources/BasicService.composite
diff --git a/branches/sca-java-1.2.1/itest/extended-api/src/main/resources/MathService.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/extended-api/src/main/resources/MathService.composite
index 8e99d3da60..8e99d3da60 100644
--- a/branches/sca-java-1.2.1/itest/extended-api/src/main/resources/MathService.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/extended-api/src/main/resources/MathService.composite
diff --git a/branches/sca-java-1.2.1/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
index c480235d88..c480235d88 100644
--- a/branches/sca-java-1.2.1/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/interfaces/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/pom.xml
index f6d79b3a38..f6d79b3a38 100644
--- a/branches/sca-java-1.2.1/itest/interfaces/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
index 5bc872ef83..5bc872ef83 100644
--- a/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
diff --git a/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
index 7bfcf5de11..7bfcf5de11 100644
--- a/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
diff --git a/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
index d4f7694e8f..d4f7694e8f 100644
--- a/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
index 6a04376168..6a04376168 100644
--- a/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
diff --git a/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
index e100636b23..e100636b23 100644
--- a/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
index 0bc8d10904..0bc8d10904 100644
--- a/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
diff --git a/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
index e2b70313ed..e2b70313ed 100644
--- a/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
diff --git a/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
index dd591eabeb..dd591eabeb 100644
--- a/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
diff --git a/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
index d4731f35d3..d4731f35d3 100644
--- a/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
index 6c40db0e70..6c40db0e70 100644
--- a/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
diff --git a/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
index 3804d31902..3804d31902 100644
--- a/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/interfaces/src/main/resources/InterfacesTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/resources/InterfacesTest.composite
index 0361d8c83c..0361d8c83c 100644
--- a/branches/sca-java-1.2.1/itest/interfaces/src/main/resources/InterfacesTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/main/resources/InterfacesTest.composite
diff --git a/branches/sca-java-1.2.1/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
index 013cdd4f15..013cdd4f15 100644
--- a/branches/sca-java-1.2.1/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/jms/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/pom.xml
index 1c3666f874..1c3666f874 100644
--- a/branches/sca-java-1.2.1/itest/jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
index 7b1c63d437..7b1c63d437 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
index 46bf911def..46bf911def 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
index cd3c09e17f..cd3c09e17f 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
index ab293a5df1..ab293a5df1 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 86d4719646..86d4719646 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index abb29aec4c..abb29aec4c 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 21d2de2cf0..21d2de2cf0 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index 218cccf64c..218cccf64c 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index f16f853ba7..f16f853ba7 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index bff4536fa0..bff4536fa0 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
index 9668bd119f..9668bd119f 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/resources/defaults/client.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/defaults/client.composite
index 02c04e6afd..02c04e6afd 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/resources/defaults/client.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/defaults/client.composite
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/resources/defaults/service.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/defaults/service.composite
index 45c1819e2b..45c1819e2b 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/resources/defaults/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/defaults/service.composite
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/resources/dynamic/client.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/dynamic/client.composite
index 494fe9790f..494fe9790f 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/resources/dynamic/client.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/dynamic/client.composite
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/resources/exceptions/client.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/exceptions/client.composite
index 8bb7f86252..8bb7f86252 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/resources/exceptions/client.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/exceptions/client.composite
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/resources/exceptions/service.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/exceptions/service.composite
index 052ff9d985..052ff9d985 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/resources/exceptions/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/exceptions/service.composite
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/resources/external/client.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/external/client.composite
index dcea428493..dcea428493 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/resources/external/client.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/external/client.composite
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/resources/external/service.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/external/service.composite
index 44b7b29610..44b7b29610 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/resources/external/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/external/service.composite
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/jndi.properties
index 9abdff215d..9abdff215d 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/resources/jndi.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/resources/oneway/OneWayClient.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/oneway/OneWayClient.composite
index cd9a62ee6f..cd9a62ee6f 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/resources/oneway/OneWayClient.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/oneway/OneWayClient.composite
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/resources/oneway/OneWayService.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/oneway/OneWayService.composite
index 3c53881141..3c53881141 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/resources/oneway/OneWayService.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/oneway/OneWayService.composite
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/resources/simple/client.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/simple/client.composite
index 3f5229a30c..3f5229a30c 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/resources/simple/client.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/simple/client.composite
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/resources/simple/mpclient.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/simple/mpclient.composite
index 2c8dc463e0..2c8dc463e0 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/resources/simple/mpclient.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/simple/mpclient.composite
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/resources/simple/service.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/simple/service.composite
index 47200f9005..47200f9005 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/resources/simple/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/simple/service.composite
diff --git a/branches/sca-java-1.2.1/itest/jms/src/main/resources/simple/uriclient.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/simple/uriclient.composite
index a6c9ee3822..a6c9ee3822 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/main/resources/simple/uriclient.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/main/resources/simple/uriclient.composite
diff --git a/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
index dca9386637..dca9386637 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
index 41fbf04c0a..41fbf04c0a 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
index 051be93f22..051be93f22 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
index c34ad07901..c34ad07901 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
index 9ec77ca440..9ec77ca440 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
index 26dda13cf9..26dda13cf9 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
index c1882a1e26..c1882a1e26 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
index bed5515d7f..bed5515d7f 100644
--- a/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/large-sdo-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/large-sdo-ws/pom.xml
index edba6ea07b..edba6ea07b 100644
--- a/branches/sca-java-1.2.1/itest/large-sdo-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/large-sdo-ws/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java
index f5a8830c4a..f5a8830c4a 100644
--- a/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java
diff --git a/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java
index 14da53cf98..14da53cf98 100644
--- a/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java
diff --git a/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java
index 3575d94f48..3575d94f48 100644
--- a/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java
diff --git a/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
index ac66b6a425..ac66b6a425 100644
--- a/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/resources/trnInq.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/resources/trnInq.composite
index 97594216e1..97594216e1 100644
--- a/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/resources/trnInq.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/resources/trnInq.composite
diff --git a/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd
index b85b80abc4..b85b80abc4 100644
--- a/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd
diff --git a/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
index 842f7a9d4c..842f7a9d4c 100644
--- a/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
diff --git a/branches/sca-java-1.2.1/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
index 17eb575d50..17eb575d50 100644
--- a/branches/sca-java-1.2.1/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/oneway/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/oneway/build.xml
index 24a49f4b36..24a49f4b36 100644
--- a/branches/sca-java-1.2.1/itest/oneway/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/oneway/build.xml
diff --git a/branches/sca-java-1.2.1/itest/oneway/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/oneway/pom.xml
index 46444b2fa8..46444b2fa8 100644
--- a/branches/sca-java-1.2.1/itest/oneway/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/oneway/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
index 0e8799ed28..0e8799ed28 100644
--- a/branches/sca-java-1.2.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
diff --git a/branches/sca-java-1.2.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
index 35c608c62d..35c608c62d 100644
--- a/branches/sca-java-1.2.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
diff --git a/branches/sca-java-1.2.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
index 127f6ec59b..127f6ec59b 100644
--- a/branches/sca-java-1.2.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
diff --git a/branches/sca-java-1.2.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServer.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServer.java
index 15b8bf278b..15b8bf278b 100644
--- a/branches/sca-java-1.2.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServer.java
diff --git a/branches/sca-java-1.2.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
index 343e9d36ff..343e9d36ff 100644
--- a/branches/sca-java-1.2.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
index f827327301..f827327301 100644
--- a/branches/sca-java-1.2.1/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
diff --git a/branches/sca-java-1.2.1/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCaseFIXME.java
index 9dfe3a8e90..9dfe3a8e90 100644
--- a/branches/sca-java-1.2.1/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCaseFIXME.java
diff --git a/branches/sca-java-1.2.1/itest/operation-overloading/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/operation-overloading/pom.xml
index 78834ed84b..78834ed84b 100644
--- a/branches/sca-java-1.2.1/itest/operation-overloading/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/operation-overloading/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
index 85b5717c00..85b5717c00 100644
--- a/branches/sca-java-1.2.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
diff --git a/branches/sca-java-1.2.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
index e5d5083a2d..e5d5083a2d 100644
--- a/branches/sca-java-1.2.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
diff --git a/branches/sca-java-1.2.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
index e206a86768..e206a86768 100644
--- a/branches/sca-java-1.2.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
diff --git a/branches/sca-java-1.2.1/itest/operation-overloading/src/main/resources/OperationOverload.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/operation-overloading/src/main/resources/OperationOverload.composite
index cbf5aa2078..cbf5aa2078 100644
--- a/branches/sca-java-1.2.1/itest/operation-overloading/src/main/resources/OperationOverload.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/operation-overloading/src/main/resources/OperationOverload.composite
diff --git a/branches/sca-java-1.2.1/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
index 0b3b12c762..0b3b12c762 100644
--- a/branches/sca-java-1.2.1/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
index 82d536cbfe..82d536cbfe 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/pom.xml
index 9f02524fc1..9f02524fc1 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
index 5f40054ada..5f40054ada 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
index 225dce0236..225dce0236 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 2b8c973e2c..2b8c973e2c 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a1c7fce60a..a1c7fce60a 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 4647a716c7..4647a716c7 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index cc5d44d279..cc5d44d279 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index 1b7fb15bf1..1b7fb15bf1 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e97331c06c..e97331c06c 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 2d1bb68e5b..2d1bb68e5b 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index 0f88cca213..0f88cca213 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index f55a068ede..f55a068ede 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index c39a34cb96..c39a34cb96 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 600f3f0c74..600f3f0c74 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index b8bca97bd0..b8bca97bd0 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
index 7edc392f46..7edc392f46 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
index 7edc392f46..7edc392f46 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
index 4779eff514..4779eff514 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
index d505834f15..d505834f15 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
index 6bcf6cef0a..6bcf6cef0a 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
index 210a68011f..210a68011f 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
index e23e1a2ecd..e23e1a2ecd 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
index 9832da880e..9832da880e 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
index 5586179421..5586179421 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
index ccc4f84ee4..ccc4f84ee4 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
index 9db2ab8f57..9db2ab8f57 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
index 9c2e15ad86..9c2e15ad86 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
index a01fcbe97f..a01fcbe97f 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
index 9d885be534..9d885be534 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
index be5ddfd06f..be5ddfd06f 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
index 3467c95cdb..3467c95cdb 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
index 8fb7566bcc..8fb7566bcc 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
index bb8fb2b07c..bb8fb2b07c 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/build-bundles.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/build-bundles.xml
index 82d536cbfe..82d536cbfe 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/build-bundles.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/build-bundles.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/pom.xml
index 8aabd00d4e..8aabd00d4e 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
index 5f40054ada..5f40054ada 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
index 225dce0236..225dce0236 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index d0b0a13e6d..d0b0a13e6d 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a1c7fce60a..a1c7fce60a 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 4647a716c7..4647a716c7 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index d2bf71ed28..d2bf71ed28 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index 1b7fb15bf1..1b7fb15bf1 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e97331c06c..e97331c06c 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 2556a0cfa0..2556a0cfa0 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index 0f88cca213..0f88cca213 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index f55a068ede..f55a068ede 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index e180c37e3f..e180c37e3f 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 600f3f0c74..600f3f0c74 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index b8bca97bd0..b8bca97bd0 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
index 7edc392f46..7edc392f46 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
index 7edc392f46..7edc392f46 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
index 828dc6f472..828dc6f472 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
index 9293b1ff52..9293b1ff52 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
index 03077aa4d4..03077aa4d4 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
index 210a68011f..210a68011f 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
index c96deb4e1b..c96deb4e1b 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
index 9832da880e..9832da880e 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
index 5586179421..5586179421 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
index ccc4f84ee4..ccc4f84ee4 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
index 93a7dfd61d..93a7dfd61d 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
index 4a96f2b829..4a96f2b829 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
index eceea08b58..eceea08b58 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
index 9d885be534..9d885be534 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
index 8e483b93bd..8e483b93bd 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
index 23aa9a2ffa..23aa9a2ffa 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
index 2ee907a655..2ee907a655 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
index 4a18aed5f3..4a18aed5f3 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/pom.xml
index e14d46cd04..e14d46cd04 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
index 108481fcbd..108481fcbd 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
index 28fe368663..28fe368663 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
index be3b7365e5..be3b7365e5 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
index 03372349f8..03372349f8 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
index a2b3a7bc92..a2b3a7bc92 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
index 36bfb12670..36bfb12670 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
diff --git a/branches/sca-java-1.2.1/itest/osgi-contribution/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/pom.xml
index ec47e1ac4e..ec47e1ac4e 100644
--- a/branches/sca-java-1.2.1/itest/osgi-contribution/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-contribution/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/build-bundles.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/build-bundles.xml
index 450b14a463..450b14a463 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/build-bundles.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/build-bundles.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/pom.xml
index a1a2675aa3..a1a2675aa3 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
index cfecd989fe..cfecd989fe 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
index 43bc26f2f5..43bc26f2f5 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
index 1a6b194b04..1a6b194b04 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
index 414e5d2f9b..414e5d2f9b 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
index 5383e1e268..5383e1e268 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
index b2af2fa68d..b2af2fa68d 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
index c05a3f52a8..c05a3f52a8 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
index a6202309bd..a6202309bd 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
index af269052c7..af269052c7 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
index 5eb16be597..5eb16be597 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
index 8479624546..8479624546 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
index 3aedabc29c..3aedabc29c 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
index b12e094bc1..b12e094bc1 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
index 59e128b993..59e128b993 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
index ff6f16cba3..ff6f16cba3 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
index 4524c6bd3d..4524c6bd3d 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
index bcd24ef0b1..bcd24ef0b1 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
index 903f8bf229..903f8bf229 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
index fe8bd23f07..fe8bd23f07 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
index ec30d641ac..ec30d641ac 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
index 34baca71d1..34baca71d1 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/Greetings.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
index 9285c0a8d5..9285c0a8d5 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
index 16d0eae990..16d0eae990 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
index 3d0e045225..3d0e045225 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
index c055aee142..c055aee142 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
index 661eb5a8cb..661eb5a8cb 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
index 0588da9a85..0588da9a85 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
index 039a214856..039a214856 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
index 4a3cd4aed2..4a3cd4aed2 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
index 2251bf5be6..2251bf5be6 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
index e2d25bf47d..e2d25bf47d 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
index f2ae804ad1..f2ae804ad1 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
index a47f68c579..a47f68c579 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
index 25d7bcf2ff..25d7bcf2ff 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
index 2762bc62be..2762bc62be 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 80346311b1..80346311b1 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a879505610..a879505610 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
index c8cb522cf4..c8cb522cf4 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 546971860e..546971860e 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
index 593e55f3f5..593e55f3f5 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
index 18483817ad..18483817ad 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
index 5ba42780f2..5ba42780f2 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
index bc569d0ac0..bc569d0ac0 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
index 599ab51a50..599ab51a50 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index df52c6c760..df52c6c760 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index aca5943552..aca5943552 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e71c624f49..e71c624f49 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
index a036ecfc76..a036ecfc76 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
index db877bb366..db877bb366 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
index ee1f575e70..ee1f575e70 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
index 09e60ca626..09e60ca626 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
index 7dd70889c7..7dd70889c7 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
index 354f40a064..354f40a064 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index d0cf43a960..d0cf43a960 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index ff40a7ae36..ff40a7ae36 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
index ef989d6fcf..ef989d6fcf 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index effae8c246..effae8c246 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
index 4effadf208..4effadf208 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
index 13bce67bb4..13bce67bb4 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
index 071a131f40..071a131f40 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
index 6ebd1f2894..6ebd1f2894 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
index b66961b1c2..b66961b1c2 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index 9edf3567e5..9edf3567e5 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
index 659f16be7f..659f16be7f 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 7c9e102fd2..7c9e102fd2 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index bb04ff42e0..bb04ff42e0 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
index 3317816557..3317816557 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
index 6d1ad76796..6d1ad76796 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml
index 2d345390b7..2d345390b7 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
index 71e248590b..71e248590b 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
index 7c1125bbb5..7c1125bbb5 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
index 8456b878f2..8456b878f2 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
index d5a47c6403..d5a47c6403 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
index e6391d2159..e6391d2159 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
index c79ede815b..c79ede815b 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
index 04cc73b85c..04cc73b85c 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
index 9ece700efe..9ece700efe 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
index 52bc43478d..52bc43478d 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/Customer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
index 0b8d2e5851..0b8d2e5851 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/factory-test.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
index 87370a6df4..87370a6df4 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
index 127349eacf..127349eacf 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
index 7e3810c458..7e3810c458 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
index fb9a112d18..fb9a112d18 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
index ee732b5efc..ee732b5efc 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
index b1723660d7..b1723660d7 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
index fb9a112d18..fb9a112d18 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
index ee732b5efc..ee732b5efc 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
index b1723660d7..b1723660d7 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
index 5172cbe21e..5172cbe21e 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
index b7591e732d..b7591e732d 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
index 9750ab87a5..9750ab87a5 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
index 7d3aaea185..7d3aaea185 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
index 3e55e8cd12..3e55e8cd12 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
index 80d4cec20c..80d4cec20c 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
index 962ba1288a..962ba1288a 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
index 40ac1fd0e3..40ac1fd0e3 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
index 49f82b0233..49f82b0233 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
index 348dcf9db3..348dcf9db3 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
index 8709796821..8709796821 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
index d8adaa2ba3..d8adaa2ba3 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
index a062dcbcd5..a062dcbcd5 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
index 6005ae785c..6005ae785c 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
index 6f0b79ebc2..6f0b79ebc2 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
index f87126d9a8..f87126d9a8 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
index bb15e6e3aa..bb15e6e3aa 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
index 7591201b8c..7591201b8c 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
index ea86bca732..ea86bca732 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
index fc86a76784..fc86a76784 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
index 5e4537b9aa..5e4537b9aa 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
index 8de85e952a..8de85e952a 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
index 70701098a7..70701098a7 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
index 3c0979e5bf..3c0979e5bf 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
index 8d44067992..8d44067992 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
index f9a098a0f6..f9a098a0f6 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
index ca1392d2b8..ca1392d2b8 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
index 255566625f..255566625f 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
index 760c761666..760c761666 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
index e328debec3..e328debec3 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
index 3b7f37e5ef..3b7f37e5ef 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
index ec3be25d53..ec3be25d53 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
index dfa0b9e170..dfa0b9e170 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
index 75a0421aed..75a0421aed 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
index c7f13a50a7..c7f13a50a7 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
index 3420f6b1c4..3420f6b1c4 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
index cbebf7eec2..cbebf7eec2 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
index 97cb4a33c1..97cb4a33c1 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
index 2cc0228c83..2cc0228c83 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
index 25cfd13751..25cfd13751 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
index 491b8d73eb..491b8d73eb 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
index 6db5cab7a7..6db5cab7a7 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
index b10d0416dc..b10d0416dc 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
index a2a29f5ac1..a2a29f5ac1 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
index db68d7e333..db68d7e333 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
index 1aea3cf669..1aea3cf669 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
index 0852c13c88..0852c13c88 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
index 1e3c915a59..1e3c915a59 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
index d7d0b41f5e..d7d0b41f5e 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
index 09c1fa163c..09c1fa163c 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
index ca50b554df..ca50b554df 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
index 14658127f8..14658127f8 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
index d8b40c7935..d8b40c7935 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
index 97fe7f82d8..97fe7f82d8 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
index e1610b2b48..e1610b2b48 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
index fe0a197f16..fe0a197f16 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
index 94b586296d..94b586296d 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
index a162da77a8..a162da77a8 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
index 23374f2dee..23374f2dee 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
index 2bafcfc36d..2bafcfc36d 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
index 553a26c0d5..553a26c0d5 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
index 97ef1fe520..97ef1fe520 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
index 724c8132df..724c8132df 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
index 1e5035d949..1e5035d949 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
index 321b1eecaf..321b1eecaf 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
index 6e51b3d6f2..6e51b3d6f2 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
index 9a87758ec2..9a87758ec2 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
index 3d8fdfc967..3d8fdfc967 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
index c19895bab1..c19895bab1 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
index 707609d2c4..707609d2c4 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
index c75e948c31..c75e948c31 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
index d96f6481fb..d96f6481fb 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
index 10ef690c9b..10ef690c9b 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
index 3d0516bbaa..3d0516bbaa 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
index fefdea106d..fefdea106d 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
index f6b847ed59..f6b847ed59 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
index 58b603fd1d..58b603fd1d 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
index ca50b554df..ca50b554df 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
index 14658127f8..14658127f8 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
index 0d5ff8abfd..0d5ff8abfd 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
index ca50b554df..ca50b554df 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
index 14658127f8..14658127f8 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
index 5599a21c07..5599a21c07 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
index 9e7a4de550..9e7a4de550 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
index 3e369cf962..3e369cf962 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
index 9b66802033..9b66802033 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
index ae3640dc57..ae3640dc57 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
index b10d0416dc..b10d0416dc 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
index 148e399701..148e399701 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
index 1ba16d0693..1ba16d0693 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
index a55ebd02a8..a55ebd02a8 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
index ee5cf72443..ee5cf72443 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
index d518ecab62..d518ecab62 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
index d7d0b41f5e..d7d0b41f5e 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
index 6fb4acfbed..6fb4acfbed 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
index d72db04425..d72db04425 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
index f9c1218f82..f9c1218f82 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
index da39022d1e..da39022d1e 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
index a6de268bf6..a6de268bf6 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
index 660e277693..660e277693 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
index 5e0965d047..5e0965d047 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
index 5e0965d047..5e0965d047 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
index 5e0965d047..5e0965d047 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
index 5e0965d047..5e0965d047 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
index 02ae93aec2..02ae93aec2 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
index c94504f07d..c94504f07d 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/properties-test.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
index fea03404fd..fea03404fd 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
index 3c425fcbc9..3c425fcbc9 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/Customer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/Customer.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/Customer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/Customer.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/Retailer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/Shipper.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
index c144a1bc18..c144a1bc18 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/services-test.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/services-test.composite
index 64f3b30f88..64f3b30f88 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/services-test.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/services/services-test.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
index 0b0aa0912b..0b0aa0912b 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Customer1.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Customer2.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
index 877d0de1c9..877d0de1c9 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/version-test.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/version-test.composite
index bbb397ee70..bbb397ee70 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/version-test.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/version/version-test.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
index 617200d8dd..617200d8dd 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
index 213cde2c1d..213cde2c1d 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
index 0dca0da75e..0dca0da75e 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
index 953045fefa..953045fefa 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
index c621d9aca0..c621d9aca0 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
index 6d3f853382..6d3f853382 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
index d545c844d2..d545c844d2 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
index 54b9b00bc8..54b9b00bc8 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
index b26bfbd98d..b26bfbd98d 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
index 667df7aa12..667df7aa12 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
index a95437f8c1..a95437f8c1 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
index c5d94df93d..c5d94df93d 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
index d340923938..d340923938 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
index 49afb3d8e8..49afb3d8e8 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
index a858c18a90..a858c18a90 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
index a9941aebcd..a9941aebcd 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
index 8e939b1a83..8e939b1a83 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
index 8e5df17f2a..8e5df17f2a 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
index 5376687b61..5376687b61 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
index 6d8dc1021e..6d8dc1021e 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
index e037ae9675..e037ae9675 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
index eecf67913d..eecf67913d 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
index 203bf5123c..203bf5123c 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
index 429b1f10ef..429b1f10ef 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
index dbc980f8c4..dbc980f8c4 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
index e39295a402..e39295a402 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
index c2f6bff4f5..c2f6bff4f5 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
index 17ba7a2f14..17ba7a2f14 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
index 8c33720018..8c33720018 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
index 0c6edd6691..0c6edd6691 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
index 0b48ac90ba..0b48ac90ba 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
index c84741f34f..c84741f34f 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
index 5a9b2a8b1d..5a9b2a8b1d 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
index 7b95c12038..7b95c12038 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
index 36bfb12670..36bfb12670 100644
--- a/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
index 8cea2be8a0..8cea2be8a0 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
index 3b5e808d1b..3b5e808d1b 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
index bb3a263632..bb3a263632 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
index 270f589f7c..270f589f7c 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
index 30be1feee9..30be1feee9 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
index 5d9ce2bdfe..5d9ce2bdfe 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/TestBundleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/TestBundleActivator.java
index a354ae0443..a354ae0443 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/TestBundleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/TestBundleActivator.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
index 179ca9ac53..179ca9ac53 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
index 067071e93c..067071e93c 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
index f3dd7c2392..f3dd7c2392 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
index acdc14153c..acdc14153c 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
index d009ab116f..d009ab116f 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
index 44fcd77036..44fcd77036 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
index c3d7237470..c3d7237470 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
index 6a4553bdb6..6a4553bdb6 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
index 6ab92ffc5a..6ab92ffc5a 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
index 6bbac4c72d..6bbac4c72d 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
index 99748739f6..99748739f6 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
index 6f459face6..6f459face6 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
index e1ea45120f..e1ea45120f 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
index 51ce909cbd..51ce909cbd 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/pom.xml
index 227edfb139..227edfb139 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/sca-api/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/sca-api/pom.xml
index 20f688adff..20f688adff 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/sca-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/sca-api/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/build-bundles.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/build-bundles.xml
index b4251a2fd3..b4251a2fd3 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/build-bundles.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/build-bundles.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/pom.xml
index 9da6008984..9da6008984 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
index 006cccda58..006cccda58 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
index 35190c7ca4..35190c7ca4 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index d6f164c5aa..d6f164c5aa 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index d7b52ee07b..d7b52ee07b 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 28de2cf1c2..28de2cf1c2 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index 37de2d70c0..37de2d70c0 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
index be36629b3c..be36629b3c 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
index d4055a8fc3..d4055a8fc3 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
index 714d1826e1..714d1826e1 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
index 5be79b741a..5be79b741a 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
index 466bc38fc2..466bc38fc2 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
index 88d1e72efc..88d1e72efc 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/tuscany-3rdparty/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/tuscany-3rdparty/pom.xml
index 8ea34ec9b9..8ea34ec9b9 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/tuscany-3rdparty/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/tuscany-3rdparty/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/tuscany-extensions/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/tuscany-extensions/pom.xml
index 0c52e264b1..0c52e264b1 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/tuscany-extensions/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/tuscany-extensions/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/tuscany-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/tuscany-runtime/pom.xml
index e2a5f983d6..e2a5f983d6 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/tuscany-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/tuscany-runtime/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/osgi-tuscany/tuscany-spi/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/tuscany-spi/pom.xml
index a0be4b1922..a0be4b1922 100644
--- a/branches/sca-java-1.2.1/itest/osgi-tuscany/tuscany-spi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/osgi-tuscany/tuscany-spi/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/policy/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/pom.xml
index 34466901b4..34466901b4 100644
--- a/branches/sca-java-1.2.1/itest/policy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/AddService.java
index 5f90ec7245..5f90ec7245 100644
--- a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/CalculatorClient.java
index 9abc488523..9abc488523 100644
--- a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/CalculatorService.java
index b5d3cce0ff..b5d3cce0ff 100644
--- a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
index 28ce0ec78a..28ce0ec78a 100644
--- a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/DivideService.java
index f72b05cece..f72b05cece 100644
--- a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/PolicyQNames.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/PolicyQNames.java
index 3e1bc45842..3e1bc45842 100644
--- a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/PolicyQNames.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/PolicyQNames.java
diff --git a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
index 4b04a4d0b8..4b04a4d0b8 100644
--- a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
diff --git a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
index 35cef96287..35cef96287 100644
--- a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
diff --git a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
index 3269d77876..3269d77876 100644
--- a/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
diff --git a/branches/sca-java-1.2.1/itest/policy/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/resources/Calculator.composite
index 1ade981ca7..1ade981ca7 100644
--- a/branches/sca-java-1.2.1/itest/policy/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.2.1/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index d9f144b3ff..d9f144b3ff 100644
--- a/branches/sca-java-1.2.1/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.2.1/itest/policy/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/resources/definitions.xml
index 54aa8ec480..54aa8ec480 100644
--- a/branches/sca-java-1.2.1/itest/policy/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.2.1/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
index 885e8314ef..885e8314ef 100644
--- a/branches/sca-java-1.2.1/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/pom.xml
index 6f0f7cd550..6f0f7cd550 100644
--- a/branches/sca-java-1.2.1/itest/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/properties/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/pom.xml
index 9316575075..9316575075 100644
--- a/branches/sca-java-1.2.1/itest/properties/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
index b0fd64c9da..b0fd64c9da 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
index 8d37877d98..8d37877d98 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
index 06699ca1ee..06699ca1ee 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
index 2f5e07a343..2f5e07a343 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
index d996c3d108..d996c3d108 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
index 16accc1680..16accc1680 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
index 5e3c985144..5e3c985144 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
index eac497636b..eac497636b 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
index 5b93bd8b8a..5b93bd8b8a 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
index 8286621ed0..8286621ed0 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
index acd1f26670..acd1f26670 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
index 71dce41efc..71dce41efc 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
index c6b9096e8b..c6b9096e8b 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
index b3a5b3d702..b3a5b3d702 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
index a57ccd90c8..a57ccd90c8 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
index c147a2affe..c147a2affe 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
index 0a84e93828..0a84e93828 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
index 6344a8aa83..6344a8aa83 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
index 11a0a758cd..11a0a758cd 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/resources/ConstructorPropertyInjection.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
index 70a251fa16..70a251fa16 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/resources/Outer.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/resources/Outer.composite
index b3e529e8b5..b3e529e8b5 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/resources/Outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/resources/Outer.composite
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/resources/OuterPropertyTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/resources/OuterPropertyTest.composite
index 5237e964a3..5237e964a3 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/resources/OuterPropertyTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/resources/OuterPropertyTest.composite
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/resources/PropertyTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/resources/PropertyTest.composite
index 33cd8ecbfc..33cd8ecbfc 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/resources/PropertyTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/resources/PropertyTest.composite
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/resources/customer.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/resources/customer.xsd
index 7421750f1b..7421750f1b 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/resources/customer.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/resources/customer.xsd
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/resources/fileProperty.txt b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/resources/fileProperty.txt
index 0d3d9ead83..0d3d9ead83 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/resources/fileProperty.txt
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/resources/fileProperty.txt
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/resources/manyValuesFileProperty.txt b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/resources/manyValuesFileProperty.txt
index 15d470afa6..15d470afa6 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/resources/manyValuesFileProperty.txt
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/resources/manyValuesFileProperty.txt
diff --git a/branches/sca-java-1.2.1/itest/properties/src/main/resources/mySimpleService.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/resources/mySimpleService.composite
index 75fdd24add..75fdd24add 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/main/resources/mySimpleService.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/main/resources/mySimpleService.composite
diff --git a/branches/sca-java-1.2.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
index 31e6bda658..31e6bda658 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
index 0273223a55..0273223a55 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
index f4244a6020..f4244a6020 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
index 7a26e49e63..7a26e49e63 100644
--- a/branches/sca-java-1.2.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/pom.xml
index dbf25652e8..dbf25652e8 100644
--- a/branches/sca-java-1.2.1/itest/recursive/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/CompositeClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/CompositeClient.java
index 5edc305970..5edc305970 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/CompositeClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/CompositeClient.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/Source.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/Source.java
index d0efcc1df1..d0efcc1df1 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/Source.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/Source.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/SourceCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/SourceCallback.java
index baa95a8e39..baa95a8e39 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/SourceCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/SourceCallback.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/SourceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/SourceImpl.java
index b9a0c7ff74..b9a0c7ff74 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/SourceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/SourceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/Target.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/Target.java
index 9a8f68a7fa..9a8f68a7fa 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/Target.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/Target.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/TargetImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/TargetImpl.java
index 86686e9233..86686e9233 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/TargetImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/composite/TargetImpl.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/java/foo/A.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/foo/A.java
index e87cbde26d..e87cbde26d 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/java/foo/A.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/foo/A.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/java/foo/B.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/foo/B.java
index 9d060cab59..9d060cab59 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/java/foo/B.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/foo/B.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/java/foo/I.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/foo/I.java
index f6d55baef3..f6d55baef3 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/java/foo/I.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/foo/I.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/java/sample/ComponentAImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/sample/ComponentAImpl.java
index f513949105..f513949105 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/java/sample/ComponentAImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/sample/ComponentAImpl.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/java/sample/ComponentCImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/sample/ComponentCImpl.java
index 586a9ee6a7..586a9ee6a7 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/java/sample/ComponentCImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/sample/ComponentCImpl.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/java/sample/ComponentEImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/sample/ComponentEImpl.java
index dbf2735aa7..dbf2735aa7 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/java/sample/ComponentEImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/sample/ComponentEImpl.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/java/sample/ComponentFImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/sample/ComponentFImpl.java
index 5e136e536c..5e136e536c 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/java/sample/ComponentFImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/sample/ComponentFImpl.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/java/sample/Service1.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/sample/Service1.java
index 81bdce79f1..81bdce79f1 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/java/sample/Service1.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/sample/Service1.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/java/test/Aggregator.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/test/Aggregator.java
index 88b3bed1b2..88b3bed1b2 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/java/test/Aggregator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/test/Aggregator.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/java/test/AggregatorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/test/AggregatorImpl.java
index f6ac6c8741..f6ac6c8741 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/java/test/AggregatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/test/AggregatorImpl.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/java/test/InnerSourceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/test/InnerSourceImpl.java
index c8dad5ae35..c8dad5ae35 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/java/test/InnerSourceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/test/InnerSourceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/java/test/OuterSourceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/test/OuterSourceImpl.java
index 11816e82cf..11816e82cf 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/java/test/OuterSourceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/test/OuterSourceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/java/test/Source.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/test/Source.java
index 9b93740d9d..9b93740d9d 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/java/test/Source.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/test/Source.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/java/test1/composite/Target.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/test1/composite/Target.java
index 4883e12f49..4883e12f49 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/java/test1/composite/Target.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/test1/composite/Target.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/java/test1/composite/TargetOne.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/test1/composite/TargetOne.java
index a7c68f4ffd..a7c68f4ffd 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/java/test1/composite/TargetOne.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/test1/composite/TargetOne.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/java/test1/composite/TargetTwo.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/test1/composite/TargetTwo.java
index 7fff8e2e9b..7fff8e2e9b 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/java/test1/composite/TargetTwo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/java/test1/composite/TargetTwo.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/AComposite.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/AComposite.composite
index 1b5dee8762..1b5dee8762 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/AComposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/AComposite.composite
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/BComposite.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/BComposite.composite
index 7d4588eba4..7d4588eba4 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/BComposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/BComposite.composite
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/CComposite.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/CComposite.composite
index 6d7b4ec600..6d7b4ec600 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/CComposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/CComposite.composite
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/Composite1.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/Composite1.composite
index 56fd7c621f..56fd7c621f 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/Composite1.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/Composite1.composite
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/Composite2.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/Composite2.composite
index 54f10673a4..54f10673a4 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/Composite2.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/Composite2.composite
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/Composite3.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/Composite3.composite
index 040653493f..040653493f 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/Composite3.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/Composite3.composite
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/Inner.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/Inner.composite
index 398ebdf6e2..398ebdf6e2 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/Inner.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/Inner.composite
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/InnerComposite.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/InnerComposite.composite
index 3376ac8ff5..3376ac8ff5 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/InnerComposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/InnerComposite.composite
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/InnerComposite2.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/InnerComposite2.composite
index c9eff4fa9d..c9eff4fa9d 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/InnerComposite2.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/InnerComposite2.composite
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
index 966f977dea..966f977dea 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/Outer.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/Outer.composite
index 987990d854..987990d854 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/Outer.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/Outer.composite
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/OuterComposite.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/OuterComposite.composite
index cb1c1e13d4..cb1c1e13d4 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/OuterComposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/OuterComposite.composite
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/foo/foo.png b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/foo/foo.png
index 0f2ec78aaf..0f2ec78aaf 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/foo/foo.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/foo/foo.png
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/foo/o1.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/foo/o1.composite
index 1d31c2f424..1d31c2f424 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/foo/o1.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/foo/o1.composite
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/foo/o2.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/foo/o2.composite
index 4f21c21860..4f21c21860 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/foo/o2.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/foo/o2.composite
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/foo/o3.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/foo/o3.composite
index 72c732c03e..72c732c03e 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/foo/o3.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/foo/o3.composite
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/foo/o4.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/foo/o4.composite
index f8f07eed09..f8f07eed09 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/foo/o4.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/foo/o4.composite
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/test1/InnerComposite.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/test1/InnerComposite.composite
index 177fa10550..177fa10550 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/test1/InnerComposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/test1/InnerComposite.composite
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/test1/OuterComposite.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/test1/OuterComposite.composite
index d05a67f45f..d05a67f45f 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/main/resources/test1/OuterComposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/main/resources/test1/OuterComposite.composite
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/test/java/composite/CompositeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/composite/CompositeTestCase.java
index 5482e47463..5482e47463 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/test/java/composite/CompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/composite/CompositeTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
index 691f429244..691f429244 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
index 7c94360658..7c94360658 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/test/java/foo/O2TestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/foo/O2TestCase.java
index d617ec8592..d617ec8592 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/test/java/foo/O2TestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/foo/O2TestCase.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/test/java/foo/O4TestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/foo/O4TestCase.java
index 15626c75ac..15626c75ac 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/test/java/foo/O4TestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/foo/O4TestCase.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/C.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/C.java
index bf8391348b..bf8391348b 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/C.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/C.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/CImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/CImpl.java
index 466284983e..466284983e 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/CImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/CImpl.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/NestedTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/NestedTestCase.java
index fc5d251460..fc5d251460 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/NestedTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/NestedTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
index a543add69b..a543add69b 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/X.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/X.java
index e3a9335068..e3a9335068 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/X.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/X.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/XImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/XImpl.java
index e430807568..e430807568 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/XImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/XImpl.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/Y.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/Y.java
index c15a4f635a..c15a4f635a 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/Y.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/Y.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/YImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/YImpl.java
index 994c9eb95f..994c9eb95f 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/YImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/sample/YImpl.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/test/java/test/InnerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/test/InnerTestCase.java
index ebb4bc7acb..ebb4bc7acb 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/test/java/test/InnerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/test/InnerTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/test/java/test/OuterTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/test/OuterTestCase.java
index 17de5ca4a8..17de5ca4a8 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/test/java/test/OuterTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/test/OuterTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
index b3abcac06e..b3abcac06e 100644
--- a/branches/sca-java-1.2.1/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/references/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/pom.xml
index 6b2d29bf47..6b2d29bf47 100644
--- a/branches/sca-java-1.2.1/itest/references/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
index f8c0850118..f8c0850118 100644
--- a/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
diff --git a/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
index 647fff0159..647fff0159 100644
--- a/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
index 785920bb2d..785920bb2d 100644
--- a/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
diff --git a/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
index 6b1065ab0d..6b1065ab0d 100644
--- a/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
index d436c28adc..d436c28adc 100644
--- a/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
diff --git a/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
index a1823e1cdc..a1823e1cdc 100644
--- a/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
index c4718cd4ac..c4718cd4ac 100644
--- a/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
diff --git a/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
index 79c802bc97..79c802bc97 100644
--- a/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/references/src/main/resources/AutoWiredReferencesTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/main/resources/AutoWiredReferencesTest.composite
index 68663f7b26..68663f7b26 100644
--- a/branches/sca-java-1.2.1/itest/references/src/main/resources/AutoWiredReferencesTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/main/resources/AutoWiredReferencesTest.composite
diff --git a/branches/sca-java-1.2.1/itest/references/src/main/resources/InnerReferencesTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/main/resources/InnerReferencesTest.composite
index 6cadc52c13..6cadc52c13 100644
--- a/branches/sca-java-1.2.1/itest/references/src/main/resources/InnerReferencesTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/main/resources/InnerReferencesTest.composite
diff --git a/branches/sca-java-1.2.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
index b803f4bfa4..b803f4bfa4 100644
--- a/branches/sca-java-1.2.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
index 1d8284f0fd..1d8284f0fd 100644
--- a/branches/sca-java-1.2.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/scopes/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/scopes/pom.xml
index 293731bf8c..293731bf8c 100644
--- a/branches/sca-java-1.2.1/itest/scopes/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/scopes/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
index f913b57130..f913b57130 100644
--- a/branches/sca-java-1.2.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
diff --git a/branches/sca-java-1.2.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
index 5e01553b78..5e01553b78 100644
--- a/branches/sca-java-1.2.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
diff --git a/branches/sca-java-1.2.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
index 878f7e4cc6..878f7e4cc6 100644
--- a/branches/sca-java-1.2.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
diff --git a/branches/sca-java-1.2.1/itest/scopes/src/main/resources/scopes.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/scopes/src/main/resources/scopes.composite
index 54a1b66830..54a1b66830 100644
--- a/branches/sca-java-1.2.1/itest/scopes/src/main/resources/scopes.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/scopes/src/main/resources/scopes.composite
diff --git a/branches/sca-java-1.2.1/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
index ce2519cbc0..ce2519cbc0 100644
--- a/branches/sca-java-1.2.1/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/services/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/pom.xml
index 466a55fb0a..466a55fb0a 100644
--- a/branches/sca-java-1.2.1/itest/services/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
index 1304ba4288..1304ba4288 100644
--- a/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
diff --git a/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
index 3577e09add..3577e09add 100644
--- a/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
index 2e9b56d64d..2e9b56d64d 100644
--- a/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
diff --git a/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
index cda3f38636..cda3f38636 100644
--- a/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
index 39806a8101..39806a8101 100644
--- a/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
diff --git a/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
index 8713e5ab22..8713e5ab22 100644
--- a/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
index aa745deb63..aa745deb63 100644
--- a/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
diff --git a/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
index 83da15089f..83da15089f 100644
--- a/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
diff --git a/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
index 36189f94bb..36189f94bb 100644
--- a/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
diff --git a/branches/sca-java-1.2.1/itest/services/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/main/resources/META-INF/sca-contribution.xml
index 37ea8f677d..37ea8f677d 100644
--- a/branches/sca-java-1.2.1/itest/services/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/itest/services/src/main/resources/ServicesTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/main/resources/ServicesTest.composite
index eda885f9ec..eda885f9ec 100644
--- a/branches/sca-java-1.2.1/itest/services/src/main/resources/ServicesTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/main/resources/ServicesTest.composite
diff --git a/branches/sca-java-1.2.1/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
index ba6cac279c..ba6cac279c 100644
--- a/branches/sca-java-1.2.1/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/spring/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/pom.xml
index 3f22138c00..3f22138c00 100644
--- a/branches/sca-java-1.2.1/itest/spring/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
index 7068224183..7068224183 100644
--- a/branches/sca-java-1.2.1/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
diff --git a/branches/sca-java-1.2.1/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
index 3b87979ab2..3b87979ab2 100644
--- a/branches/sca-java-1.2.1/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-1.2.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
index 70b2d5fdab..70b2d5fdab 100644
--- a/branches/sca-java-1.2.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
index bab9ecb528..bab9ecb528 100644
--- a/branches/sca-java-1.2.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
index 634e3d34af..634e3d34af 100644
--- a/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
index e0b1a79c95..e0b1a79c95 100644
--- a/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
diff --git a/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
index 3957e49bf3..3957e49bf3 100644
--- a/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
index d75d19295d..d75d19295d 100644
--- a/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
diff --git a/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
index 4088691ccd..4088691ccd 100644
--- a/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
index d70010fcea..d70010fcea 100644
--- a/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
index fa7967c964..fa7967c964 100644
--- a/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
diff --git a/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
index b57cc7f366..b57cc7f366 100644
--- a/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
diff --git a/branches/sca-java-1.2.1/itest/transaction/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/pom.xml
index 4252c3e3ba..4252c3e3ba 100644
--- a/branches/sca-java-1.2.1/itest/transaction/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
index d7d18181d9..d7d18181d9 100644
--- a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
index ac986dd417..ac986dd417 100644
--- a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
index a6ea036da7..a6ea036da7 100644
--- a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
index e0a7a0ed9f..e0a7a0ed9f 100644
--- a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
index 4d504a6a36..4d504a6a36 100644
--- a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
index 156b34227d..156b34227d 100644
--- a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
index b7ea5f2663..b7ea5f2663 100644
--- a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
index 341a7e53e3..341a7e53e3 100644
--- a/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/main/resources/accounts.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/main/resources/accounts.composite
index f4c6b650c7..f4c6b650c7 100644
--- a/branches/sca-java-1.2.1/itest/transaction/src/main/resources/accounts.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/main/resources/accounts.composite
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/main/resources/definitions.xml
index b1599c0633..b1599c0633 100644
--- a/branches/sca-java-1.2.1/itest/transaction/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/main/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/main/resources/log4j.properties
index 698ee41d7e..698ee41d7e 100644
--- a/branches/sca-java-1.2.1/itest/transaction/src/main/resources/log4j.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/main/resources/log4j.properties
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
index c23628ff91..c23628ff91 100644
--- a/branches/sca-java-1.2.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
index 36884f6098..36884f6098 100644
--- a/branches/sca-java-1.2.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/wasAdmin.py b/sca-java-1.x/branches/sca-java-1.2.1/itest/wasAdmin.py
index 2be2b1eff7..2be2b1eff7 100644
--- a/branches/sca-java-1.2.1/itest/wasAdmin.py
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wasAdmin.py
diff --git a/branches/sca-java-1.2.1/itest/wires/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/wires/pom.xml
index 26fd57fdb6..26fd57fdb6 100644
--- a/branches/sca-java-1.2.1/itest/wires/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wires/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
index 09d5b0278e..09d5b0278e 100644
--- a/branches/sca-java-1.2.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
diff --git a/branches/sca-java-1.2.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
index f0964ebb93..f0964ebb93 100644
--- a/branches/sca-java-1.2.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
index c19a0b4f74..c19a0b4f74 100644
--- a/branches/sca-java-1.2.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
diff --git a/branches/sca-java-1.2.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
index b7ccdbf8d1..b7ccdbf8d1 100644
--- a/branches/sca-java-1.2.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wires/src/main/resources/WireTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/wires/src/main/resources/WireTest.composite
index 8b764d0e7d..8b764d0e7d 100644
--- a/branches/sca-java-1.2.1/itest/wires/src/main/resources/WireTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wires/src/main/resources/WireTest.composite
diff --git a/branches/sca-java-1.2.1/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
index 95f721cd8e..95f721cd8e 100644
--- a/branches/sca-java-1.2.1/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/ws-void-args-return/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/ws-void-args-return/pom.xml
index 6bec182058..6bec182058 100644
--- a/branches/sca-java-1.2.1/itest/ws-void-args-return/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/ws-void-args-return/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/java/voidtest/Bean.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
index 43e251369d..43e251369d 100644
--- a/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
diff --git a/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
index 55454e24b8..55454e24b8 100644
--- a/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
index 4919f1cdfc..4919f1cdfc 100644
--- a/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
index 76f8afe93d..76f8afe93d 100644
--- a/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
diff --git a/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
index 2dd0c29975..2dd0c29975 100644
--- a/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
diff --git a/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/resources/voidtest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/resources/voidtest.composite
index 0f31c4cd2c..0f31c4cd2c 100644
--- a/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/resources/voidtest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/ws-void-args-return/src/main/resources/voidtest.composite
diff --git a/branches/sca-java-1.2.1/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
index f0666d71db..f0666d71db 100644
--- a/branches/sca-java-1.2.1/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl-multiple/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl-multiple/pom.xml
index 340f241ce0..340f241ce0 100644
--- a/branches/sca-java-1.2.1/itest/wsdl-multiple/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl-multiple/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
index 842ae0a692..842ae0a692 100644
--- a/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
index d2d898e9c4..d2d898e9c4 100644
--- a/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
index d4fbd434fe..d4fbd434fe 100644
--- a/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
index a46f763960..a46f763960 100644
--- a/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
index 9ff6ab09ba..9ff6ab09ba 100644
--- a/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
diff --git a/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
index 5ec5e46151..5ec5e46151 100644
--- a/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
diff --git a/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
index 93108d2ef0..93108d2ef0 100644
--- a/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
diff --git a/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
index 6d00b53682..6d00b53682 100644
--- a/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
diff --git a/branches/sca-java-1.2.1/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
index 6a872faa17..6a872faa17 100644
--- a/branches/sca-java-1.2.1/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
index 5852f8d802..5852f8d802 100644
--- a/branches/sca-java-1.2.1/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/pom.xml
index 1e7925fd4c..1e7925fd4c 100644
--- a/branches/sca-java-1.2.1/itest/wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
index 265b11f7dd..265b11f7dd 100644
--- a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
index f8c9c28f26..f8c9c28f26 100644
--- a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
index f16d20689d..f16d20689d 100644
--- a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
index cba6f2ee6c..cba6f2ee6c 100644
--- a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
index 9f15be0236..9f15be0236 100644
--- a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
index f174e1af07..f174e1af07 100644
--- a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
index 4a5b7bceef..4a5b7bceef 100644
--- a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
index e747eb041f..e747eb041f 100644
--- a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
index c9076ebba6..c9076ebba6 100644
--- a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
index d706517b76..d706517b76 100644
--- a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
index 9d147dc013..9d147dc013 100644
--- a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
index 7556e02b36..7556e02b36 100644
--- a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
index e7031ff41c..e7031ff41c 100644
--- a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
index 7a049ed7b0..7a049ed7b0 100644
--- a/branches/sca-java-1.2.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl/src/main/resources/SDOWSDLTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/resources/SDOWSDLTest.composite
index 62596ee62a..62596ee62a 100644
--- a/branches/sca-java-1.2.1/itest/wsdl/src/main/resources/SDOWSDLTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/resources/SDOWSDLTest.composite
diff --git a/branches/sca-java-1.2.1/itest/wsdl/src/main/resources/WSDLTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/resources/WSDLTest.composite
index 2024578dae..2024578dae 100644
--- a/branches/sca-java-1.2.1/itest/wsdl/src/main/resources/WSDLTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/resources/WSDLTest.composite
diff --git a/branches/sca-java-1.2.1/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
index 73f9ed4bfc..73f9ed4bfc 100644
--- a/branches/sca-java-1.2.1/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-java-1.2.1/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
index 3921dec72d..3921dec72d 100644
--- a/branches/sca-java-1.2.1/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
index 12441753fb..12441753fb 100644
--- a/branches/sca-java-1.2.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
index fd30d69c79..fd30d69c79 100644
--- a/branches/sca-java-1.2.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/wsdl2java/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl2java/pom.xml
index 3a941162ca..3a941162ca 100644
--- a/branches/sca-java-1.2.1/itest/wsdl2java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl2java/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/wsdl2java/src/test/resources/AccountService.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl2java/src/test/resources/AccountService.wsdl
index 9e5650e7dd..9e5650e7dd 100644
--- a/branches/sca-java-1.2.1/itest/wsdl2java/src/test/resources/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl2java/src/test/resources/AccountService.wsdl
diff --git a/branches/sca-java-1.2.1/itest/wsdl2java/src/test/resources/EchoService.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl2java/src/test/resources/EchoService.wsdl
index 50d580f299..50d580f299 100644
--- a/branches/sca-java-1.2.1/itest/wsdl2java/src/test/resources/EchoService.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl2java/src/test/resources/EchoService.wsdl
diff --git a/branches/sca-java-1.2.1/itest/wsdl2java/src/test/resources/EchoService.xsd b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl2java/src/test/resources/EchoService.xsd
index 8069d4861f..8069d4861f 100644
--- a/branches/sca-java-1.2.1/itest/wsdl2java/src/test/resources/EchoService.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl2java/src/test/resources/EchoService.xsd
diff --git a/branches/sca-java-1.2.1/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
index c44229c162..c44229c162 100644
--- a/branches/sca-java-1.2.1/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
diff --git a/branches/sca-java-1.2.1/itest/wsdlless/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/pom.xml
index 9d1d26390d..9d1d26390d 100644
--- a/branches/sca-java-1.2.1/itest/wsdlless/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/pom.xml
diff --git a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
index 81e393852d..81e393852d 100644
--- a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
diff --git a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
index df658428fd..df658428fd 100644
--- a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
index d39df8c00e..d39df8c00e 100644
--- a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
index d4a06780c3..d4a06780c3 100644
--- a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
index 6dc46c60b5..6dc46c60b5 100644
--- a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
index 8471000152..8471000152 100644
--- a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
index 859c61a724..859c61a724 100644
--- a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
index e747eb041f..e747eb041f 100644
--- a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
diff --git a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
index ca7c25f3fa..ca7c25f3fa 100644
--- a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
index 8b234599aa..8b234599aa 100644
--- a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
index 03984f7252..03984f7252 100644
--- a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
index 45bb697437..45bb697437 100644
--- a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
index 9342c8e6ee..9342c8e6ee 100644
--- a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
index 6c5ac96b67..6c5ac96b67 100644
--- a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
index ebaf33f568..ebaf33f568 100644
--- a/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
diff --git a/branches/sca-java-1.2.1/itest/wsdlless/src/main/resources/SDOWSDLTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
index 16d3806318..16d3806318 100644
--- a/branches/sca-java-1.2.1/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
diff --git a/branches/sca-java-1.2.1/itest/wsdlless/src/main/resources/WSDLTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/resources/WSDLTest.composite
index e69cdbc282..e69cdbc282 100644
--- a/branches/sca-java-1.2.1/itest/wsdlless/src/main/resources/WSDLTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/resources/WSDLTest.composite
diff --git a/branches/sca-java-1.2.1/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
index 73f9ed4bfc..73f9ed4bfc 100644
--- a/branches/sca-java-1.2.1/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-java-1.2.1/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
index bc6fe0e89a..bc6fe0e89a 100644
--- a/branches/sca-java-1.2.1/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
index 12441753fb..12441753fb 100644
--- a/branches/sca-java-1.2.1/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
diff --git a/branches/sca-java-1.2.1/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
index 82bf7ce650..82bf7ce650 100644
--- a/branches/sca-java-1.2.1/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/pom.xml
index 109b2f1acb..109b2f1acb 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java
index 28a5ecdc24..28a5ecdc24 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java
index 98f247e5cc..98f247e5cc 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java
index 7f3c89fd2f..7f3c89fd2f 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java
index 8966a4be9d..8966a4be9d 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java
index f3e36e8c38..f3e36e8c38 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java
index e2108b5ef8..e2108b5ef8 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java
index 0968310548..0968310548 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java
index 9022b9d9e6..9022b9d9e6 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java
index 49f7cd46b2..49f7cd46b2 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java
index d9aab9de22..d9aab9de22 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java
index 379429d17e..379429d17e 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java
index 709562cd72..709562cd72 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java
index ba91fd2168..ba91fd2168 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java
index 4e239d03d3..4e239d03d3 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java
index 030c820ed2..030c820ed2 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java
index 92f448ec87..92f448ec87 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java
index b856201551..b856201551 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java
index 90a4292546..90a4292546 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java
index a0580095a0..a0580095a0 100644
--- a/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/pom.xml
index 1f86fc1fd6..1f86fc1fd6 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
index 14f81b655b..14f81b655b 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
index 46a50ac4b8..46a50ac4b8 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
index d0d11cd02b..d0d11cd02b 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
index 023960be8b..023960be8b 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
index ab3240b9a9..ab3240b9a9 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
index 72744259f6..72744259f6 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
index a6b12cc9b6..a6b12cc9b6 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
index c21bd2cdc9..c21bd2cdc9 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
index 0ead2caefb..0ead2caefb 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
index 1ef83bc5f4..1ef83bc5f4 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
index 7dd95e3944..7dd95e3944 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
index b57f4b87ad..b57f4b87ad 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
index 6bc190aaf5..6bc190aaf5 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
index 63c5668b00..63c5668b00 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index ecc34942f1..ecc34942f1 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
index f5d8d5b84c..f5d8d5b84c 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java
index c3fdeb748b..c3fdeb748b 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
index ea082eec0b..ea082eec0b 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
index 123940b1c5..123940b1c5 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
index 8f821d7126..8f821d7126 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
index 2c6f32c3e7..2c6f32c3e7 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
index fb73b337a3..fb73b337a3 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
index 3224176d6e..3224176d6e 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
index c423df6f7d..c423df6f7d 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
index 147132cade..147132cade 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
index 1f8579a472..1f8579a472 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
index af51468791..af51468791 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
index 4546fddb2d..4546fddb2d 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
index 072fe8fde1..072fe8fde1 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
index d67ba3ec2b..d67ba3ec2b 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
index a313dd1e6d..a313dd1e6d 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
index d29fe85586..d29fe85586 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
index 5091ff700b..5091ff700b 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
index d59e69209d..d59e69209d 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
index 77166c9ac2..77166c9ac2 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
index 42b9f5db9c..42b9f5db9c 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
index db379c0ac6..db379c0ac6 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/LICENSE
index f2215fcae5..f2215fcae5 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/pom.xml
index 7d74806423..7d74806423 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-all.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-all.xsd
index 89279510d5..89279510d5 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-all.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-all.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
index 26bedfcce5..26bedfcce5 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
index 850f32b56a..850f32b56a 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
index c7ea897cbf..c7ea897cbf 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
index 3e92de193b..3e92de193b 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-core.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-core.xsd
index 1c6291792b..1c6291792b 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-core.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-core.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-definitions.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
index 0249882a92..0249882a92 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
index 87b443fb36..87b443fb36 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
index 99669bc672..99669bc672 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
index 6f1cf14a4b..6f1cf14a4b 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
index 1bca6199cb..1bca6199cb 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
index f9d8171b8e..f9d8171b8e 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
index 1cf9fb3ea9..1cf9fb3ea9 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
index 44f14e5ed5..44f14e5ed5 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
index 81f939bdb4..81f939bdb4 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
index c1fdfd8f3c..c1fdfd8f3c 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-policy.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-policy.xsd
index c22ffd6618..c22ffd6618 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-policy.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca-policy.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca.xsd
index 10f54275d0..10f54275d0 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/sca.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
index c93a1d72de..c93a1d72de 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
index d0da5421ec..d0da5421ec 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
index ff48b97d7a..ff48b97d7a 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
index 7c79738898..7c79738898 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
index 6d5468b2f9..6d5468b2f9 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
index 2697a1ea98..2697a1ea98 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
index 821f323d73..821f323d73 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
index 1b5c8aece2..1b5c8aece2 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
index f8d437310e..f8d437310e 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
index f8ece54a07..f8ece54a07 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
index dd596821ea..dd596821ea 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
index e1723d65f0..e1723d65f0 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
index 0c0998595f..0c0998595f 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
index cdabb697aa..cdabb697aa 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
index da5e696e01..da5e696e01 100644
--- a/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
diff --git a/branches/sca-java-1.2.1/modules/assembly/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/assembly/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/assembly/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/assembly/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/assembly/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/assembly/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/assembly/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/pom.xml
index 0184c617fc..0184c617fc 100644
--- a/branches/sca-java-1.2.1/modules/assembly/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
index b8487d95c5..b8487d95c5 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
index 029b1326b9..029b1326b9 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
index a9ef26bbb9..a9ef26bbb9 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
index 9ae511c07b..9ae511c07b 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
index 8a4fc6dfda..8a4fc6dfda 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
index 76511d351d..76511d351d 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
index 514456f86a..514456f86a 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
index f49a653aa9..f49a653aa9 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
index 8e1943224c..8e1943224c 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
index 2798ab56f7..2798ab56f7 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
index b0c24aef39..b0c24aef39 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
index 65945692f1..65945692f1 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
index e1ea65ea39..e1ea65ea39 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
index 2c7b7c6b9e..2c7b7c6b9e 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
index d3fa80ba74..d3fa80ba74 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
index 7143f571f9..7143f571f9 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
index f3c0a07863..f3c0a07863 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
index 9890bfed68..9890bfed68 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
index 55540452af..55540452af 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
index 5dd256e3c4..5dd256e3c4 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
index 3577a94d1e..3577a94d1e 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
index 720a6801a2..720a6801a2 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
index 5d15ce9938..5d15ce9938 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
index 8a7dee1d8d..8a7dee1d8d 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
index 98ff92f15b..98ff92f15b 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
index 683920da58..683920da58 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
index f38346663a..f38346663a 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
index 2cf04277cd..2cf04277cd 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
index 0abfd13d10..0abfd13d10 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
index 020870cd34..020870cd34 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
index ee65e5746e..ee65e5746e 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
index 5f5856d051..5f5856d051 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
index 26bdc3cffa..26bdc3cffa 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
index 5a2015f55e..5a2015f55e 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
index aecdf417f2..aecdf417f2 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
index 6772045c06..6772045c06 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
index 8965410438..8965410438 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java
index 265846e23f..265846e23f 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
index c1a4605f83..c1a4605f83 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
index ef9d65b37c..ef9d65b37c 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
index fee8e02f4e..fee8e02f4e 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
index f536b35140..f536b35140 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
index ced482dbf6..ced482dbf6 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
index 2096bbd651..2096bbd651 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java
index 07e26d0fc6..07e26d0fc6 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java
index ba4cec0fc9..ba4cec0fc9 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputationException.java
index 86bd2a6449..86bd2a6449 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputationException.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java
index 6003b3f67d..6003b3f67d 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
index efd10bfe9a..efd10bfe9a 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
index b572b67ced..b572b67ced 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
index 1007286e40..1007286e40 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
index a4599e96f6..a4599e96f6 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
index b7c63dc2b4..b7c63dc2b4 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
index d0ee3832c5..d0ee3832c5 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
index 346764b1b4..346764b1b4 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
index 016a9a5b05..016a9a5b05 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
index 553e600bc9..553e600bc9 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
index 4082d81fdb..4082d81fdb 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
index 34429a6703..34429a6703 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
index e2e7b59896..e2e7b59896 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
index 63a4def855..63a4def855 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
index 0c78a2505f..0c78a2505f 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
index bbe665d52f..bbe665d52f 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
index 0b36aad9b7..0b36aad9b7 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
index 4348e08fcb..4348e08fcb 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
index 6777a96982..6777a96982 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
index e2c4f82b9d..e2c4f82b9d 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
index d5701df74e..d5701df74e 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
index ea7ecfc30b..ea7ecfc30b 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
index 9a7ca09e43..9a7ca09e43 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
index 2368896a69..2368896a69 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
index 0c1051199f..0c1051199f 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
index 297a7c3a99..297a7c3a99 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
index bee7cbec2d..bee7cbec2d 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
index 1a7abc8564..1a7abc8564 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
index 859c4bde4b..859c4bde4b 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
index 767b152624..767b152624 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
index 40d5f4e63f..40d5f4e63f 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
index 19702954c9..19702954c9 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
index dbe0cb8225..dbe0cb8225 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
index ee6b95edc9..ee6b95edc9 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
index d94a7e93a3..d94a7e93a3 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CalculateBindingURITestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CalculateBindingURITestCase.java
index f06b8e95ea..f06b8e95ea 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CalculateBindingURITestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CalculateBindingURITestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
index 854d15f546..854d15f546 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
index c8694966fe..c8694966fe 100644
--- a/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/pom.xml
index c0aec10604..c0aec10604 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
index 7356cd0d2a..7356cd0d2a 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
index cc351442e7..cc351442e7 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
index b457840922..b457840922 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
index e414198f4d..e414198f4d 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
index cd4e99d499..cd4e99d499 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
index 1e5a74954a..1e5a74954a 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
index 9739fa22f4..9739fa22f4 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
index 7561d3004e..7561d3004e 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
index ac0c836646..ac0c836646 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 1b9052299c..1b9052299c 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
index a294e0ecfa..a294e0ecfa 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
index 5e9331ae06..5e9331ae06 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
index 2173eabef9..2173eabef9 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
index dcea5a9039..dcea5a9039 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
index 24baaa51cd..24baaa51cd 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
index 1987c042e6..1987c042e6 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
index 9268fbe211..9268fbe211 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-atom/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-atom/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-atom/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-atom/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/pom.xml
index 633055442d..633055442d 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
index 807d6a8971..807d6a8971 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
index 6e5623e1a2..6e5623e1a2 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
index ea06625d34..ea06625d34 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
index aeec78aca3..aeec78aca3 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
index a8117db8f3..a8117db8f3 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 52e0e916f5..52e0e916f5 100644
--- a/branches/sca-java-1.2.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/binding-dwr/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-dwr/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-dwr/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-dwr/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-dwr/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-dwr/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-dwr/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/pom.xml
index 5bc96426ad..5bc96426ad 100644
--- a/branches/sca-java-1.2.1/modules/binding-dwr/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
index f2ed343ea0..f2ed343ea0 100644
--- a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
index 281be750d1..281be750d1 100644
--- a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
diff --git a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
index ab40ae40cb..ab40ae40cb 100644
--- a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
index c6697e1b46..c6697e1b46 100644
--- a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
index 6e78d2937b..6e78d2937b 100644
--- a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
diff --git a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
index 8960ba8d96..8960ba8d96 100644
--- a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
diff --git a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
index 1a9f91fab2..1a9f91fab2 100644
--- a/branches/sca-java-1.2.1/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/pom.xml
index 7b98ad8abb..7b98ad8abb 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
index dfc8d2d00e..dfc8d2d00e 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
index 90056b8343..90056b8343 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
index 13b069a6bb..13b069a6bb 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
index 543bd51d60..543bd51d60 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
index cff632eb3d..cff632eb3d 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
index 9e512e83af..9e512e83af 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
index 1be4a98a48..1be4a98a48 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
index 3ff0ed552a..3ff0ed552a 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
index f9aa9ffa22..f9aa9ffa22 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
index 092c8f87f4..092c8f87f4 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
index e44233e1e9..e44233e1e9 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
index 3af2833870..3af2833870 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
index 86b19ea3d9..86b19ea3d9 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
index b2861d4122..b2861d4122 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
index 9ba17691c3..9ba17691c3 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
index 945427ced2..945427ced2 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
index 89d6e1bf55..89d6e1bf55 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
index 14a7e94e48..14a7e94e48 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
index 95d0542e4f..95d0542e4f 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
index c05f9ad631..c05f9ad631 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
index 6a96b14d78..6a96b14d78 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
index e6f4032d06..e6f4032d06 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
index 1d99f157bb..1d99f157bb 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 82e85ef067..82e85ef067 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index a89f711da9..a89f711da9 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/BankManagerFacade.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/BankManagerFacade.java
index a8100d280b..a8100d280b 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/BankManagerFacade.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/BankManagerFacade.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/Customer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/Customer.java
index 3c39a73586..3c39a73586 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/Customer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/Customer.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/CustomerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/CustomerImpl.java
index 3d3f785a50..3d3f785a50 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/CustomerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/account/CustomerImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/calculator/AddService.java
index 7cefba530a..7cefba530a 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/calculator/AddServiceHome.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/calculator/AddServiceHome.java
index 8b62f3c3d8..8b62f3c3d8 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/calculator/AddServiceHome.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/calculator/AddServiceHome.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
index 70e2461b0e..70e2461b0e 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
index 56c80f60eb..56c80f60eb 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
index a54c9bc41b..a54c9bc41b 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
index 27d2a0be58..27d2a0be58 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
index 275ae31f90..275ae31f90 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/resources/account/account.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/resources/account/account.composite
index 14f77eed08..14f77eed08 100644
--- a/branches/sca-java-1.2.1/modules/binding-ejb/src/test/resources/account/account.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ejb/src/test/resources/account/account.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/pom.xml
index 041b3f1334..041b3f1334 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java
index 85ee25bf42..85ee25bf42 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java
index 050ba9b73c..050ba9b73c 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java
index a71205ea77..a71205ea77 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java
index c95c8ac012..c95c8ac012 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java
index 5feaae401c..5feaae401c 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java
index 39a4213a65..39a4213a65 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java
index 503f30e685..503f30e685 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java
index a9a1167544..a9a1167544 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
index 0fb3b0211b..0fb3b0211b 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java
index 4d8fb943f0..4d8fb943f0 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java
index ced9d8e194..ced9d8e194 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java
index 45b35d9206..45b35d9206 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java
index 18bc73efde..18bc73efde 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomFeedEntryUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomFeedEntryUtil.java
index 7adbfca6e8..7adbfca6e8 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomFeedEntryUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomFeedEntryUtil.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java
index e93ecd40ee..e93ecd40ee 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
index 5cc0a30d7b..5cc0a30d7b 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
index 85fd626871..85fd626871 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java
index ec5ba85657..ec5ba85657 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java
index a60b1f5b3f..a60b1f5b3f 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java
index 6ef305f2fb..6ef305f2fb 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java
index 5e91268349..5e91268349 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory
index 49478e3db0..49478e3db0 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory
index f69b024da9..f69b024da9 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 3f073b28b9..3f073b28b9 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index f81a0d33ae..f81a0d33ae 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Consumer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Consumer.java
index 4a33637121..4a33637121 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Consumer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Consumer.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClient.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClient.java
index b7416011ba..b7416011ba 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClient.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java
index 884e954036..884e954036 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java
index ca4a5a1946..ca4a5a1946 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Provider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Provider.java
index a9ddc1a2c8..a9ddc1a2c8 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Provider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Provider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
index 1987c042e6..1987c042e6 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
index 9268fbe211..9268fbe211 100644
--- a/branches/sca-java-1.2.1/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-http/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-http/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-http/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-http/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/pom.xml
index aa2a7d70ef..aa2a7d70ef 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
index 6192b92dfe..6192b92dfe 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
index 370e4cdb67..370e4cdb67 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
index 7e72b7dd85..7e72b7dd85 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
index ced0d79887..ced0d79887 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
index 421ecfcd1c..421ecfcd1c 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
index e20d420d49..e20d420d49 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
index 900ac5156e..900ac5156e 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
index 196394d7ef..196394d7ef 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
index 44da6b166c..44da6b166c 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index cc07784cb7..cc07784cb7 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 0fa8d44c08..0fa8d44c08 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
index bc87dd2f93..bc87dd2f93 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
index 0e0360d821..0e0360d821 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
index 1cfc02a473..1cfc02a473 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/test/resources/content/test.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/resources/content/test.html
diff --git a/branches/sca-java-1.2.1/modules/binding-http/src/test/resources/test.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/resources/test.composite
index 62c4af4e22..62c4af4e22 100644
--- a/branches/sca-java-1.2.1/modules/binding-http/src/test/resources/test.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-http/src/test/resources/test.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/pom.xml
index f3b9f5ae45..f3b9f5ae45 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
index 39be2afd49..39be2afd49 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
index 3c5999015a..3c5999015a 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java
index 60cd33d9bb..60cd33d9bb 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
index f6a11412e5..f6a11412e5 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
index 2730567618..2730567618 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java
index 9169d3f5c5..9169d3f5c5 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
index d66079886b..d66079886b 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
index a51bf51a22..a51bf51a22 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
index 686a6fa477..686a6fa477 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
index 1749d378b1..1749d378b1 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorImpl.java
index f37fe21709..f37fe21709 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
index 5b68b4900f..5b68b4900f 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ac37a0f26b..ac37a0f26b 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index dec0991984..dec0991984 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 86d4719646..86d4719646 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index abb29aec4c..abb29aec4c 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index daa3d551df..daa3d551df 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
index 575ed669ca..575ed669ca 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCaseFIXME.java
index 368c8a2239..368c8a2239 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCaseFIXME.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCaseFIXME.java
index b88341fc03..b88341fc03 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCaseFIXME.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/test/resources/simple/client.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/resources/simple/client.composite
index dcea428493..dcea428493 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/test/resources/simple/client.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/resources/simple/client.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-jms/src/test/resources/simple/service.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/resources/simple/service.composite
index 44b7b29610..44b7b29610 100644
--- a/branches/sca-java-1.2.1/modules/binding-jms/src/test/resources/simple/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jms/src/test/resources/simple/service.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/NOTICE
index 28064e5de1..28064e5de1 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/pom.xml
index b237b77b28..b237b77b28 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
index 409acf99f7..409acf99f7 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java
index a351aaa025..a351aaa025 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JavaToSmd.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JavaToSmd.java
index fea001bc8e..fea001bc8e 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JavaToSmd.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JavaToSmd.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java
index 425f71caf9..425f71caf9 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
index a9fff462fa..a9fff462fa 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
index b551007413..b551007413 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
index e2528f59e5..e2528f59e5 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
index 839a190b83..839a190b83 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 3adbec0f97..3adbec0f97 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 4767358e7a..4767358e7a 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/jsonrpc.js b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/jsonrpc.js
index d837bab91c..d837bab91c 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/jsonrpc.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/jsonrpc.js
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java
index 584228abde..584228abde 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java
index e63cafd6a6..e63cafd6a6 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
index f937e80cf5..f937e80cf5 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite
index 491b42c69c..491b42c69c 100644
--- a/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/pom.xml
index 030b3fdc58..030b3fdc58 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java
index e320357d93..e320357d93 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java
index f09798859b..f09798859b 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java
index 2749f5f958..2749f5f958 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
index 992cbb6c2d..992cbb6c2d 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
index 2cefaa8bba..2cefaa8bba 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
index 0c9e1df1bc..0c9e1df1bc 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
index 7592f4f824..7592f4f824 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java
index f088025a23..f088025a23 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java
index b594fde29f..b594fde29f 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
index 59ab37b2eb..59ab37b2eb 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
index 7748fdffe9..7748fdffe9 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java
index 81f87dc4da..81f87dc4da 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java
index 6e61f82042..6e61f82042 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java
index a46ae13763..a46ae13763 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java
index 8dc5be9b16..8dc5be9b16 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
index 015ccebaa9..015ccebaa9 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java
index 41610edc3b..41610edc3b 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java
index e80af5ea68..e80af5ea68 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
index 7df1c21ca9..7df1c21ca9 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
index a4bee61947..a4bee61947 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java
index aec7907441..aec7907441 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
index 68d9340abf..68d9340abf 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java
index 04d7aca0e6..04d7aca0e6 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
index ea66e8f11b..ea66e8f11b 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java
index 9b7eb149e0..9b7eb149e0 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
index 1c3a0aaee8..1c3a0aaee8 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java
index eb1a89812d..eb1a89812d 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
index af20d02c00..af20d02c00 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java
index 8dcf9fda58..8dcf9fda58 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
index c5c8a99e5c..c5c8a99e5c 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java
index e92ffc1d0c..e92ffc1d0c 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java
index c2c16ab5cd..c2c16ab5cd 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
index 68099b40bb..68099b40bb 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
index 9533ea3062..9533ea3062 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
index 159357ed90..159357ed90 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java
index 76e4999ddc..76e4999ddc 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java
index 54bda38033..54bda38033 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java
index c0a324d663..c0a324d663 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java
index 8318892e0f..8318892e0f 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java
index aaa9ddb7b5..aaa9ddb7b5 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
index 26b8fd0357..26b8fd0357 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java
index b546f8c550..b546f8c550 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
index 1039a3df9d..1039a3df9d 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java
index 25eb336c05..25eb336c05 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
index 76f2e8ec81..76f2e8ec81 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java
index fa73da9a19..fa73da9a19 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
index 8a05440319..8a05440319 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java
index 39d53bca8d..39d53bca8d 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java
index 13d686b803..13d686b803 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java
index f1f1a7737b..f1f1a7737b 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java
index aeafce46e0..aeafce46e0 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java
index 5871d370fb..5871d370fb 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
index ba52687e16..ba52687e16 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java
index 0aec2da465..0aec2da465 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
index 53f56b6626..53f56b6626 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java
index 1684d0c3ee..1684d0c3ee 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java
index f4702806e0..f4702806e0 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
index fcd0717688..fcd0717688 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
index db65ba7491..db65ba7491 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java
index 72aa20af3d..72aa20af3d 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
index 391820444f..391820444f 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java
index 2c0c846841..2c0c846841 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
index 8314d628ba..8314d628ba 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java
index b89bfa2470..b89bfa2470 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
index 1abb187271..1abb187271 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java
index f12a4582dd..f12a4582dd 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
index 75ee8aea6f..75ee8aea6f 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java
index 91bf371549..91bf371549 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
index 34dee40761..34dee40761 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java
index 0f661717c0..0f661717c0 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
index 6ffbd8724e..6ffbd8724e 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java
index 0047f2b6cb..0047f2b6cb 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
index 56e6c361c3..56e6c361c3 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java
index 40795987d0..40795987d0 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
index 3f0ddc546c..3f0ddc546c 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java
index 68bc368a53..68bc368a53 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
index 057d686905..057d686905 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java
index d87c9d4eb5..d87c9d4eb5 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
index 8f5d368e05..8f5d368e05 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java
index a45c6807e6..a45c6807e6 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java
index 046914e9db..046914e9db 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java
index a7f26003b0..a7f26003b0 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 5e5ce97054..5e5ce97054 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java
index a7e864cb55..a7e864cb55 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java
index 4f51175407..4f51175407 100644
--- a/branches/sca-java-1.2.1/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/pom.xml
index b65257e45b..b65257e45b 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
index e9986e216c..e9986e216c 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingActivator.java
index 066335fd57..066335fd57 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingActivator.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java
index f60b0680e4..f60b0680e4 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.java
index 2853946560..2853946560 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java
index 2c3be9539b..2c3be9539b 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
index 582f321be9..582f321be9 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java
index acb81a00f6..acb81a00f6 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java
index 73aedc3b6c..73aedc3b6c 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java
index f636c8f7d8..f636c8f7d8 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java
index d5dc509f3e..d5dc509f3e 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
index e626293c6e..e626293c6e 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType
index 224a68f88d..224a68f88d 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType
index a83e7e6d1d..a83e7e6d1d 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType
diff --git a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/RMIBindingTest.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/RMIBindingTest.composite
index d29fe85586..d29fe85586 100644
--- a/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/RMIBindingTest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rmi/src/test/resources/RMIBindingTest.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/pom.xml
index f1730d8d6c..f1730d8d6c 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
index c2d3dc4085..c2d3dc4085 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
index 2213b50b53..2213b50b53 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
index 0912878938..0912878938 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
index fb83f9b420..fb83f9b420 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
index 8873c19800..8873c19800 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
index ad1a4de4f6..ad1a4de4f6 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
index 57c43aa800..57c43aa800 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
index cc37512175..cc37512175 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index e60dc2855a..e60dc2855a 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
index 19370285f5..19370285f5 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
index af87155f45..af87155f45 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
index e71156c379..e71156c379 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
index d45be65e20..d45be65e20 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
index ae7b72834e..ae7b72834e 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
index 43cd5e00b9..43cd5e00b9 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
index 5ffcb50eb8..5ffcb50eb8 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-rss/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-rss/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-rss/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-rss/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/pom.xml
index 9c09ed88f0..9c09ed88f0 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
index 2b4989264c..2b4989264c 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
index 3e691e636e..3e691e636e 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
index a4e6a8283d..a4e6a8283d 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
index ae9cca1638..ae9cca1638 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
index 73c47a3f41..73c47a3f41 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 2d0597ff01..2d0597ff01 100644
--- a/branches/sca-java-1.2.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/pom.xml
index bbe5f6aaa6..bbe5f6aaa6 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
index b067fae901..b067fae901 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
index 6ced6de979..6ced6de979 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
index fd9061b852..fd9061b852 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
index d51f3caaec..d51f3caaec 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
index 076648c78b..076648c78b 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 1b369cde06..1b369cde06 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
index 95d08c9fcb..95d08c9fcb 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java
index 9b99ecfa5e..9b99ecfa5e 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
index e61e8d2362..e61e8d2362 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/NodeFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/NodeFactoryImpl.java
index 729250a21f..729250a21f 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/NodeFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/NodeFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
index ffa4f3f316..ffa4f3f316 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
index 58d97c644f..58d97c644f 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java
index 3d337ed304..3d337ed304 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java
index 8530f37f07..8530f37f07 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
index cf1db53cff..cf1db53cff 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
index 55ec104a73..55ec104a73 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
index ed1a2abad2..ed1a2abad2 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
index a63d773dbe..a63d773dbe 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
index 4990d9c15f..4990d9c15f 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
index fc3342750b..fc3342750b 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
index 70488ce22e..70488ce22e 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
index 8fafe0b165..8fafe0b165 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
index 6e3931e708..6e3931e708 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
index fd1178af68..fd1178af68 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
index aa911d63d6..aa911d63d6 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
index d418d8db9a..d418d8db9a 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
index 028b03e56c..028b03e56c 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
index b78325d21c..b78325d21c 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
index c4347b084a..c4347b084a 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
index 3da588a834..3da588a834 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
index d69f442879..d69f442879 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
index eecadac929..eecadac929 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
index ba0f9c7b79..ba0f9c7b79 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
index c9e2d122e0..c9e2d122e0 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
index ba0f9c7b79..ba0f9c7b79 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
index d5d7773353..d5d7773353 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
index 485e0815d2..485e0815d2 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
index ba0f9c7b79..ba0f9c7b79 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
index 9396dfd1f2..9396dfd1f2 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
index bf30bdf42d..bf30bdf42d 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
index ba0f9c7b79..ba0f9c7b79 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
index 67c240592d..67c240592d 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
index ba0f9c7b79..ba0f9c7b79 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
index 3c2f377ec8..3c2f377ec8 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
index ba0f9c7b79..ba0f9c7b79 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
index fadb164636..fadb164636 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
index ba0f9c7b79..ba0f9c7b79 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
index 174292b8b8..174292b8b8 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
index ba0f9c7b79..ba0f9c7b79 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/DISCLAIMER
index 8e5c524323..8e5c524323 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/pom.xml
index cf9a179bdd..cf9a179bdd 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
index 0988f675e7..0988f675e7 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index bc9f9b7d62..bc9f9b7d62 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
index 552b993c2b..552b993c2b 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
index 9e9d4913a2..9e9d4913a2 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/resources/Calculator.composite
index 9028662d05..9028662d05 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/resources/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
index f02e7d6fc0..f02e7d6fc0 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/pom.xml
index 278da71d7b..278da71d7b 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
index 396de570e8..396de570e8 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
index 17f6888813..17f6888813 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
index 24325dd2bd..24325dd2bd 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java
index 5c1cefb808..5c1cefb808 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
index 8662d92044..8662d92044 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
index c1011c5811..c1011c5811 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
index e69c96ba2e..e69c96ba2e 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
index ea758823a9..ea758823a9 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
index 03d05f4c9f..03d05f4c9f 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java
index 52c0f64fe5..52c0f64fe5 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
index 4efa03a933..4efa03a933 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
index 22c9a64b05..22c9a64b05 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 5c6b8e21fc..5c6b8e21fc 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
index 8bac9e01c9..8bac9e01c9 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
index f3736cb229..f3736cb229 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-sca/src/test/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/test/resources/Calculator.composite
index ec72c777ef..ec72c777ef 100644
--- a/branches/sca-java-1.2.1/modules/binding-sca/src/test/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-sca/src/test/resources/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/pom.xml
index 1def910d94..1def910d94 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
index bedee689d5..bedee689d5 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
index 83e2870bb8..83e2870bb8 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
index 9501c90ce2..9501c90ce2 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
index 4e771171b0..4e771171b0 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
index 3cdaba8da1..3cdaba8da1 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
index 3e599d38cd..3e599d38cd 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
index 3b188b0176..3b188b0176 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
index 20930666b1..20930666b1 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
index 45be9ef0d0..45be9ef0d0 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
index a90ebffe2e..a90ebffe2e 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
index ed2d862722..ed2d862722 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
index c761c7481e..c761c7481e 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
index 567d313d0a..567d313d0a 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java
index 05a4245a3c..05a4245a3c 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLDefinitionHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLDefinitionHelper.java
index f4bc6ab4a0..f4bc6ab4a0 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLDefinitionHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLDefinitionHelper.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
index 370b83f87b..370b83f87b 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index a48ff54c77..a48ff54c77 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
index fdf34c5a80..fdf34c5a80 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
index 5f2b66a75f..5f2b66a75f 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.3.mar b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.3.mar
+++ b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java
index 2ce23bf2c4..2ce23bf2c4 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java
index d4d20414e5..d4d20414e5 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java
index 767f59646f..767f59646f 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java
index e5e76af0b7..e5e76af0b7 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java
index 2dc7d8dee4..2dc7d8dee4 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java
index e60c30790a..e60c30790a 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java
index 5e1a4cf259..5e1a4cf259 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java
index d028ced69e..d028ced69e 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java
index c7b503af17..c7b503af17 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java
index e2f3982d99..e2f3982d99 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java
index 88705c1a95..88705c1a95 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java
index f30286feea..f30286feea 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java
index 7ee48d4451..7ee48d4451 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java
index f09ca4a435..f09ca4a435 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java
index f3a4ae4c8b..f3a4ae4c8b 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java
index d1cbfb88fd..d1cbfb88fd 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java
index 71d7bf68fb..71d7bf68fb 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java
index e7511027c2..e7511027c2 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java
index 017d9bb478..017d9bb478 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java
index a3a43d032f..a3a43d032f 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java
index 4ceee2d63e..4ceee2d63e 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
index 535ad3eeca..535ad3eeca 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
index 56d0537a44..56d0537a44 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java
index f5d87cdcee..f5d87cdcee 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java
index 03b3edf15b..03b3edf15b 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java
index cc32fa0f37..cc32fa0f37 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java
index 37161d53ec..37161d53ec 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java
index eeeee9cecd..eeeee9cecd 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java
index 635ca034e3..635ca034e3 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
index 327000ac73..327000ac73 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java
index 8986f68151..8986f68151 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java
index 395cfe28d6..395cfe28d6 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java
index 90a2a95abb..90a2a95abb 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java
index d463cad33f..d463cad33f 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java
index 536f4cacea..536f4cacea 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java
index db5b88f9ac..db5b88f9ac 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java
index 506270b437..506270b437 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java
index 5c5950419b..5c5950419b 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java
index b78a21c366..b78a21c366 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java
index 14e7f6b99d..14e7f6b99d 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java
index 42d11ac2f0..42d11ac2f0 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
index fadeb714b4..fadeb714b4 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java
index a48296f76b..a48296f76b 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java
index b2ccd7f97d..b2ccd7f97d 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
index 9b92f6862f..9b92f6862f 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index 32b042402b..32b042402b 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
index 34df9447b1..34df9447b1 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
index b11c50b00c..b11c50b00c 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
index c1a516c2d8..c1a516c2d8 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
index 24dc2de89d..24dc2de89d 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl
index 4c85637f0d..4c85637f0d 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
index 21896f3b32..21896f3b32 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties
index b1902de916..b1902de916 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
index 75d0dc717c..75d0dc717c 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties
index b1902de916..b1902de916 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
index c98b9cb815..c98b9cb815 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
index 89e4892f62..89e4892f62 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
index 6b8cca67cb..6b8cca67cb 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
index 6cdb0c78f4..6cdb0c78f4 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/pom.xml
index 2c3aa0b978..2c3aa0b978 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java
index e82e93d971..e82e93d971 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
index 82ed771473..82ed771473 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
index ecc7f2d750..ecc7f2d750 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index cb982e8647..cb982e8647 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
index cb6c790563..cb6c790563 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
index 19d377f915..19d377f915 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
index 896a901862..896a901862 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
index 959802af43..959802af43 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
index 37c80aa910..37c80aa910 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
index 5e8e5dad0d..5e8e5dad0d 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
index ad81fc7867..ad81fc7867 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
index 39cd5547d9..39cd5547d9 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
index 8e26f7b4b5..8e26f7b4b5 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
index c2210f4a94..c2210f4a94 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
index 529b395fd5..529b395fd5 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
index 666a7e4069..666a7e4069 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
diff --git a/branches/sca-java-1.2.1/modules/binding-ws/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/binding-ws/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/binding-ws/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/binding-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/pom.xml
index 5f5c7dcbd5..5f5c7dcbd5 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
index 04f8ab0d3c..04f8ab0d3c 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
index 23dc629bf6..23dc629bf6 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
index 1ad38c69e4..1ad38c69e4 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
index a13584a3c2..a13584a3c2 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
index 8902dd04ee..8902dd04ee 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
index 0a410fdcdf..0a410fdcdf 100644
--- a/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/NOTICE
index aeeca5ef8d..aeeca5ef8d 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/pom.xml
index dd71547fc3..dd71547fc3 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java
index d2bc77126d..d2bc77126d 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java
index 43ab6fc5a4..43ab6fc5a4 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java
index 21cf04271b..21cf04271b 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index f9dbee53bb..f9dbee53bb 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 86434ac4bf..86434ac4bf 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java
index b0c920cb72..b0c920cb72 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java
index 9fa8dfb674..9fa8dfb674 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy
index c172528538..c172528538 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy
diff --git a/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite
index 0d4c17a15b..0d4c17a15b 100644
--- a/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/pom.xml
index 184f23cc61..184f23cc61 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
index 24aff4023e..24aff4023e 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
index 3df275a7a1..3df275a7a1 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
index f3006b0af5..f3006b0af5 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
index 19afc63c5a..19afc63c5a 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
index 4ad070b2c3..4ad070b2c3 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
index cd5e87ca42..cd5e87ca42 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
index 630d1f6bf4..630d1f6bf4 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
index b644709266..b644709266 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
index c33b31b550..c33b31b550 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
index 9b3dce7029..9b3dce7029 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
index 64af372111..64af372111 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
index 98852e951c..98852e951c 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
index 01083cc6a6..01083cc6a6 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
index 66ecd33da6..66ecd33da6 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
index f96771095b..f96771095b 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
index dfb600153e..dfb600153e 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
index 9c46c679d2..9c46c679d2 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/test.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/test.composite
index 1e09549194..1e09549194 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/test.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/test.composite
diff --git a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/test.ext b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/test.ext
index e69de29bb2..e69de29bb2 100644
--- a/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/test.ext
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-impl/src/test/resources/test.ext
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/pom.xml
index c50241ae0f..c50241ae0f 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
index 886c61c00a..886c61c00a 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
index 41e93ec148..41e93ec148 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
index d3568f6283..d3568f6283 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
index ee94d889ad..ee94d889ad 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
index 4946002b14..4946002b14 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
index 873a21a456..873a21a456 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
index f35f35ac4c..f35f35ac4c 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
index 840c4e2f02..840c4e2f02 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
index 3bf9e54774..3bf9e54774 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
index 95fba93181..95fba93181 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
index cc18d5f798..cc18d5f798 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
index 484eddd222..484eddd222 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
index 24612b0450..24612b0450 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
index a293330a57..a293330a57 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ac1fa9aade..ac1fa9aade 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index c69eb40636..c69eb40636 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
index 7debb3d3c6..7debb3d3c6 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
index c911899b08..c911899b08 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
index c1ef86b68c..c1ef86b68c 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
index 81c7ee525a..81c7ee525a 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
index 7f342c2278..7f342c2278 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-java-1.2.1/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/pom.xml
index ba1f45a674..ba1f45a674 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
index a71fa61a54..a71fa61a54 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
index c68aee8521..c68aee8521 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
index 8af36d7da0..8af36d7da0 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
index cfbac8bb1f..cfbac8bb1f 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
index 8991585d32..8991585d32 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
index bf5d636044..bf5d636044 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
index 1146e593a9..1146e593a9 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java
index e4c3a722d3..e4c3a722d3 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
index 6d2a31f702..6d2a31f702 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
index 9a4475ef23..9a4475ef23 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
index 095866fb6f..095866fb6f 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 86f199368b..86f199368b 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
index cdf16a383f..cdf16a383f 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
index 75219227c2..75219227c2 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
index 9a05e43d7a..9a05e43d7a 100644
--- a/branches/sca-java-1.2.1/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/pom.xml
index c8261e6a4f..c8261e6a4f 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
index 1e52a20d16..1e52a20d16 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
index cdbdddb31d..cdbdddb31d 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
index 5b1dd98579..5b1dd98579 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
index 07e80f66f3..07e80f66f3 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
index 52c3cd3076..52c3cd3076 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
index 7a1a104b71..7a1a104b71 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
index 9f1fcfb606..9f1fcfb606 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
index 632d135cb5..632d135cb5 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 02e8b411eb..02e8b411eb 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
index 8dec190930..8dec190930 100644
--- a/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/DISCLAIMER
index 8e5c524323..8e5c524323 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/pom.xml
index 40d12e8544..40d12e8544 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
index 02f8e60376..02f8e60376 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java
index e749b31ff6..e749b31ff6 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java
index 4119c344ce..4119c344ce 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
index cd5f97e62e..cd5f97e62e 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java
index c2d525dfef..c2d525dfef 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
index 96e642ce20..96e642ce20 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java
index 880f5f5786..880f5f5786 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportListener.java
index fa3674d678..fa3674d678 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportListener.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
index 0baa511b31..0baa511b31 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
index 9e337b898e..9e337b898e 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 14eb81546d..14eb81546d 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 08d2b1c338..08d2b1c338 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory
index d39a5065c2..d39a5065c2 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
index f4751db9aa..f4751db9aa 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
index 42592e05c0..42592e05c0 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
index 426721f0de..426721f0de 100644
--- a/branches/sca-java-1.2.1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/DISCLAIMER
index 8e5c524323..8e5c524323 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/pom.xml
index 80310ac112..80310ac112 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ArtifactsFinder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ArtifactsFinder.java
index 2587f9393a..2587f9393a 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ArtifactsFinder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ArtifactsFinder.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ComponentUpdaterImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ComponentUpdaterImpl.java
index a6a6084f5f..a6a6084f5f 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ComponentUpdaterImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ComponentUpdaterImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/CompositeUpdaterImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/CompositeUpdaterImpl.java
index ccba6b5a98..ccba6b5a98 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/CompositeUpdaterImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/CompositeUpdaterImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterFactoryImpl.java
index 7f5870ad55..7f5870ad55 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterTestCase.java
index 83d0224ad4..83d0224ad4 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/GreetService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/GreetService.java
index 0eb7fb692b..0eb7fb692b 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/GreetService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/GreetService.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/HelloComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/HelloComponent.java
index 38fa2721bb..38fa2721bb 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/HelloComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/HelloComponent.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/MetaComponentHello.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/MetaComponentHello.java
index 1495ff2cea..1495ff2cea 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/MetaComponentHello.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/MetaComponentHello.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/resources/HelloComposite.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/resources/HelloComposite.composite
index 76714a0e9c..76714a0e9c 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/resources/HelloComposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/resources/HelloComposite.composite
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/resources/repository/sample-calculator.jar b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/resources/repository/sample-calculator.jar
index 9c46c679d2..9c46c679d2 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater-impl/src/test/resources/repository/sample-calculator.jar
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/DISCLAIMER
index 8e5c524323..8e5c524323 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/pom.xml
index 0b3dcf177e..0b3dcf177e 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/MetaComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/MetaComponent.java
index 885fe8cfb0..885fe8cfb0 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/MetaComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/MetaComponent.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/xml/MetaComponentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/xml/MetaComponentProcessor.java
index 44673bfdb9..44673bfdb9 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/xml/MetaComponentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/xml/MetaComponentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentNotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentNotFoundException.java
index d93a92b32c..d93a92b32c 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentNotFoundException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdater.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdater.java
index 8743556538..8743556538 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdater.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdater.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdaterException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdaterException.java
index f94238089f..f94238089f 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdaterException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdaterException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeNotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeNotFoundException.java
index 52d7e602b7..52d7e602b7 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeNotFoundException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdater.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdater.java
index 4f55148651..4f55148651 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdater.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdater.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdaterException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdaterException.java
index 3dc86d97f7..3dc86d97f7 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdaterException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdaterException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ContributionUpdater.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ContributionUpdater.java
index a364c23174..a364c23174 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ContributionUpdater.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ContributionUpdater.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/src/test/resources/HelloComposite.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/test/resources/HelloComposite.composite
index 76714a0e9c..76714a0e9c 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/src/test/resources/HelloComposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/test/resources/HelloComposite.composite
diff --git a/branches/sca-java-1.2.1/modules/contribution-updater/src/test/resources/repository/sample-calculator.jar b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/test/resources/repository/sample-calculator.jar
index 9c46c679d2..9c46c679d2 100644
--- a/branches/sca-java-1.2.1/modules/contribution-updater/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-updater/src/test/resources/repository/sample-calculator.jar
diff --git a/branches/sca-java-1.2.1/modules/contribution-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/contribution-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/contribution-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/contribution-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/contribution-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/contribution-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/contribution-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/pom.xml
index 7d8689f1f4..7d8689f1f4 100644
--- a/branches/sca-java-1.2.1/modules/contribution-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
index 58c2c1ba4e..58c2c1ba4e 100644
--- a/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
index 51f898d802..51f898d802 100644
--- a/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
index 5a7ab9d226..5a7ab9d226 100644
--- a/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
index ac98ace66e..ac98ace66e 100644
--- a/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 68030bf6e6..68030bf6e6 100644
--- a/branches/sca-java-1.2.1/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.2.1/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
index 59188ec3a3..59188ec3a3 100644
--- a/branches/sca-java-1.2.1/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/TestModelResolver.java
index 6af6167b6c..6af6167b6c 100644
--- a/branches/sca-java-1.2.1/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/TestModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/contribution/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/contribution/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/contribution/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/contribution/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/contribution/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/contribution/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/pom.xml
index 6b7a69f952..6b7a69f952 100644
--- a/branches/sca-java-1.2.1/modules/contribution/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
index 7400501d85..7400501d85 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
index 81b0b08b9d..81b0b08b9d 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
index 47197cb10c..47197cb10c 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
index 6edf59c728..6edf59c728 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
index 98954c288a..98954c288a 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
index 555d25a2db..555d25a2db 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
index ffe190132c..ffe190132c 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
index bfa16b1ce3..bfa16b1ce3 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
index 35076f55a7..35076f55a7 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java
index 0ada4ebec3..0ada4ebec3 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
index c0dd5431d7..c0dd5431d7 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
index 881987f622..881987f622 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
index fc5eb582f7..fc5eb582f7 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
index cf54267b5f..cf54267b5f 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
index b5f536c431..b5f536c431 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
index 029df61f0f..029df61f0f 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
index df8bb4b9e0..df8bb4b9e0 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
index 3c67a8c550..3c67a8c550 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
index 426d7beb29..426d7beb29 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
index 95e5c238df..95e5c238df 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
index 61eda755bd..61eda755bd 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
index e1f1a2d27f..e1f1a2d27f 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
index e1e3a7283d..e1e3a7283d 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
index 6cd3b8da45..6cd3b8da45 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
index bcab45b8fe..bcab45b8fe 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
index 63a04a3642..63a04a3642 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
index f17f31edb1..f17f31edb1 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
index ed99239b19..ed99239b19 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
index fcf9347564..fcf9347564 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
index 9700e2bc60..9700e2bc60 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
index 2ecddf5465..2ecddf5465 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
index 7714586951..7714586951 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
index 82df73388c..82df73388c 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
index cc3bb59a5b..cc3bb59a5b 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
index b4c7236ef0..b4c7236ef0 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
index 2ef5b9eda7..2ef5b9eda7 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
index a001baa47f..a001baa47f 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
index e63269ee66..e63269ee66 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
index a4e2f5f51c..a4e2f5f51c 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
index 2831bebbc4..2831bebbc4 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
index 4a25059792..4a25059792 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
index ba5413b0d1..ba5413b0d1 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
index 4d49a13e0e..4d49a13e0e 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
index 1ca9def4ea..1ca9def4ea 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
index 24aae45b59..24aae45b59 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
index e183206894..e183206894 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java
index 5158eaf85c..5158eaf85c 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java
index ce2b4b13c3..ce2b4b13c3 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
index 33399dcc2f..33399dcc2f 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
index 838359be5f..838359be5f 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
index ecb774ac0c..ecb774ac0c 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
index 4bf29a3993..4bf29a3993 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
index 05e3c6a86d..05e3c6a86d 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
index 8bfdedf180..8bfdedf180 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
index 7fc6210680..7fc6210680 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java
index 0b9aca70cf..0b9aca70cf 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
index b0e02f06fa..b0e02f06fa 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
index 5079db4904..5079db4904 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
index 0660d69897..0660d69897 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java
index 33c847a049..33c847a049 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
index bcc346d9f8..bcc346d9f8 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
index 6b4d2ebdeb..6b4d2ebdeb 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
index 9e6433ba6c..9e6433ba6c 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
index 7609eda0d1..7609eda0d1 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
index 8ea5fc0a7e..8ea5fc0a7e 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
index 9d78ca93d0..9d78ca93d0 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
index ae6e876df6..ae6e876df6 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
index 4bb65e55e7..4bb65e55e7 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
index 727f8f6ce7..727f8f6ce7 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
index 6e61bebf79..6e61bebf79 100644
--- a/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/pom.xml
index 797ab924a4..797ab924a4 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
index bfaa69cc22..bfaa69cc22 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
index 808fb42e3b..808fb42e3b 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
index c138aba825..c138aba825 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
index 049a608592..049a608592 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
index 2effaaa95a..2effaaa95a 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
index d057207991..d057207991 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
index e5965db2c5..e5965db2c5 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
index 31dca1dba5..31dca1dba5 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
index fdd520f44a..fdd520f44a 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index baba638c9b..baba638c9b 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
index eef42bbe8f..eef42bbe8f 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCase.java.fixme b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCase.java.fixme
index ecae54188c..ecae54188c 100644
--- a/branches/sca-java-1.2.1/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCase.java.fixme
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCase.java.fixme
diff --git a/branches/sca-java-1.2.1/modules/core-spi/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/core-spi/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/core-spi/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/core-spi/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/pom.xml
index e808188844..e808188844 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/doc/Context Model.emx b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/doc/Context Model.emx
index 0445ea5a6b..0445ea5a6b 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/doc/Context Model.emx
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/doc/Context Model.emx
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
index ed4b57639c..ed4b57639c 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
index e92a8f2844..e92a8f2844 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
index 50958b7848..50958b7848 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
index d9cc716f7a..d9cc716f7a 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
index 546757c766..546757c766 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
index 56c712a65a..56c712a65a 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
index 9609487080..9609487080 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
index 7a286069d5..7a286069d5 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
index 6a0c44a404..6a0c44a404 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
index c116be921c..c116be921c 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
index b0debc36c4..b0debc36c4 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
index b34dceee62..b34dceee62 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
index ca0f4889a5..ca0f4889a5 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
index 957a15ce8a..957a15ce8a 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
index a5f221fc11..a5f221fc11 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
index 247b5969c2..247b5969c2 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
index 2748bbed9a..2748bbed9a 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
index 6e23568088..6e23568088 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
index c2a9c488b8..c2a9c488b8 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
index e1b84e4f9f..e1b84e4f9f 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
index 3626e16425..3626e16425 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
index 0f6a932c51..0f6a932c51 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
index 13d3376599..13d3376599 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
index 015c673d66..015c673d66 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
index 6a37d1e951..6a37d1e951 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
index f2b59a7c54..f2b59a7c54 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
index 644283dea1..644283dea1 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
index b60a14d2da..b60a14d2da 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
index 2102806881..2102806881 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
index d8f9973338..d8f9973338 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
index b3ab1d8b87..b3ab1d8b87 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
index e15234a549..e15234a549 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
index 851afee3c1..851afee3c1 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
index b6fafa5fb6..b6fafa5fb6 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
index 0e19538aff..0e19538aff 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
index a9238cf6eb..a9238cf6eb 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
index 2f8dd70bc5..2f8dd70bc5 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
index a349b71d72..a349b71d72 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
index 87eb0069b4..87eb0069b4 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
index da37385af1..da37385af1 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
index fbb7aae467..fbb7aae467 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
index 4b2c71b397..4b2c71b397 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
index 3cf82982dc..3cf82982dc 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
index 9d965a3369..9d965a3369 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
index b15cde066a..b15cde066a 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
index 647eba33aa..647eba33aa 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
index 5c1a3ca79d..5c1a3ca79d 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
index 66bbae684d..66bbae684d 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
index 3a563b9fb5..3a563b9fb5 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
index ad55ce386b..ad55ce386b 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
index 5701a04ed1..5701a04ed1 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
index f4e97f71ec..f4e97f71ec 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
index d1f4496337..d1f4496337 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
index e9de1f135f..e9de1f135f 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
index 95591dca5d..95591dca5d 100644
--- a/branches/sca-java-1.2.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/core-spring/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/core-spring/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/core-spring/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/core-spring/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/pom.xml
index fd33a7c331..fd33a7c331 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
index 94bd5c8cf2..94bd5c8cf2 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
index 2c27a5c6d5..2c27a5c6d5 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
index effd2b615c..effd2b615c 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
index ba2d5045f2..ba2d5045f2 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
index 9432f7b69e..9432f7b69e 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
index 9587a2b0ae..9587a2b0ae 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java
index 6b19bac413..6b19bac413 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
index 39bb377aa8..39bb377aa8 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java
index 17a7e9084c..17a7e9084c 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
index 492ab2732e..492ab2732e 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
index 7ff12f3084..7ff12f3084 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/AddService.java
index 4eeb30a9c2..4eeb30a9c2 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
index ea3e5341d5..ea3e5341d5 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorClient.java
index 56e737e3ab..56e737e3ab 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
index 11e8974657..11e8974657 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/DivideService.java
index 131c5a8014..131c5a8014 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
index 9c7e96a668..9c7e96a668 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/MultiplyService.java
index a917896aeb..a917896aeb 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
index 4892481203..4892481203 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
index 27430b7f5d..27430b7f5d 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/SubtractService.java
index e328f024ea..e328f024ea 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
index ee1d7c3457..ee1d7c3457 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
index 6e81358b03..6e81358b03 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java
index 04e4d6232e..04e4d6232e 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
index 6d998ba035..6d998ba035 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
index 8b043f2b4f..8b043f2b4f 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
index d7d1124050..d7d1124050 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
diff --git a/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
index c2b6cced36..c2b6cced36 100644
--- a/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
diff --git a/branches/sca-java-1.2.1/modules/core/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/core/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/core/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/core/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/core/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/core/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/core/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/pom.xml
index 59de2b3b30..59de2b3b30 100644
--- a/branches/sca-java-1.2.1/modules/core/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
index c86c876075..c86c876075 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
index 29dcc20f0b..29dcc20f0b 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
index 79a45bd9c3..79a45bd9c3 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
index 78096b20ab..78096b20ab 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
index 555eb43e4c..555eb43e4c 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
index 14a5f565fc..14a5f565fc 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
index b174dea6ce..b174dea6ce 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
index 455409e5e3..455409e5e3 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
index 31ddc78fce..31ddc78fce 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
index 399b0b20de..399b0b20de 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
index d261258d64..d261258d64 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
index 8d4ee4d08e..8d4ee4d08e 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
index f0ad74df36..f0ad74df36 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
index 9321caf112..9321caf112 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
index c5b68389b2..c5b68389b2 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
index b577180291..b577180291 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
index b5a9ef8682..b5a9ef8682 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
index 857a193260..857a193260 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
index efa362a929..efa362a929 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
index f303460cc5..f303460cc5 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
index 4e3f352cc8..4e3f352cc8 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
index 692d6861ba..692d6861ba 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
index 6969105661..6969105661 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
index e2ad7d6001..e2ad7d6001 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
index 517e5579a4..517e5579a4 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
index 8e90c953e5..8e90c953e5 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
index d879182e14..d879182e14 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
index cd14710880..cd14710880 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
index a4cc49204e..a4cc49204e 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
index 4c3fd8b397..4c3fd8b397 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
index 67b922b99c..67b922b99c 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
index 8b5c512cf2..8b5c512cf2 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
index 974563b57c..974563b57c 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
index d35b27fd24..d35b27fd24 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
index 3f64d2405b..3f64d2405b 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
index ec42b12e47..ec42b12e47 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
index d19aa237cd..d19aa237cd 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
index 988bbfa877..988bbfa877 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
index 26be3cfa67..26be3cfa67 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
index 2b37c30451..2b37c30451 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
index b219dd6bed..b219dd6bed 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
index 42049c83f2..42049c83f2 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
index 934f2f7aa0..934f2f7aa0 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
index edf447f6a3..edf447f6a3 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
index e17b120265..e17b120265 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
index 948ed7ad72..948ed7ad72 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
index 1faa33caed..1faa33caed 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
index 6e182a6a14..6e182a6a14 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
index 196f64f091..196f64f091 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
index 733544d387..733544d387 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
index dde20d2830..dde20d2830 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
index 5be91a052a..5be91a052a 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
index c1b0ea8fa2..c1b0ea8fa2 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
index c0646f577a..c0646f577a 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
index 1e4f663185..1e4f663185 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
index fdd710c465..fdd710c465 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
index 474df16e83..474df16e83 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
index 2c4d657882..2c4d657882 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
index 7f419028f9..7f419028f9 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
index 246f9c45d6..246f9c45d6 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
index fbc402bfe3..fbc402bfe3 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
index 7e7ab7a9e4..7e7ab7a9e4 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
index 786988613b..786988613b 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
index 5bec2f655a..5bec2f655a 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
index a6663aba09..a6663aba09 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
index 5ae8b94647..5ae8b94647 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
index 49f89661b1..49f89661b1 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
index f11a61e662..f11a61e662 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
index 1cfb6b06a4..1cfb6b06a4 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
index 0a20d793f7..0a20d793f7 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
index 6b2980b989..6b2980b989 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
index b19c14b3e0..b19c14b3e0 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
index 43a3288ff2..43a3288ff2 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
index 75261e11a8..75261e11a8 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
index 85a6626cdd..85a6626cdd 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
index c27b112f8a..c27b112f8a 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
index a2c0edb9b4..a2c0edb9b4 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
index 0471b2c52e..0471b2c52e 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
index 0f83dad97d..0f83dad97d 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
index 15959c0608..15959c0608 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
index 6e51a8c9ec..6e51a8c9ec 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
index ea8d0e876c..ea8d0e876c 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
index 5b838116c5..5b838116c5 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
index 6fe883157f..6fe883157f 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
index ea213f5311..ea213f5311 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
index 7da779bc21..7da779bc21 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
index 62ebeea1fb..62ebeea1fb 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
index 39a7c647f7..39a7c647f7 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
index 56e99be0f2..56e99be0f2 100644
--- a/branches/sca-java-1.2.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
index 7b44736d4b..7b44736d4b 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
index 2bc78c3d35..2bc78c3d35 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
index 48dcf8df07..48dcf8df07 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
index 99d5ec7bc9..99d5ec7bc9 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
index 61164fa2de..61164fa2de 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
index 64114f7fb2..64114f7fb2 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
index d46d77b4b8..d46d77b4b8 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
index 1aba9656d8..1aba9656d8 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
index 1ad0927d16..1ad0927d16 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
index e3fdf483ad..e3fdf483ad 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
index 341d889b7d..341d889b7d 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
index afd30efd92..afd30efd92 100644
--- a/branches/sca-java-1.2.1/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/pom.xml
index 9e9100108f..9e9100108f 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
index 0b3022bc7e..0b3022bc7e 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
index f120d66b0d..f120d66b0d 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
index af54f41104..af54f41104 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
index dec1cc22ae..dec1cc22ae 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
index 4f72cbde50..4f72cbde50 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
index 057274a204..057274a204 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
index c119e55dc5..c119e55dc5 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
index f5c657e29d..f5c657e29d 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
index 786e3e28d9..786e3e28d9 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
index baaa7425fc..baaa7425fc 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
index f7ccb13e6e..f7ccb13e6e 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
index 224c956fcb..224c956fcb 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
index f77658aec9..f77658aec9 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 2e94116177..2e94116177 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index a1f18f9638..a1f18f9638 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
index 661fb72905..661fb72905 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/ipo.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/ipo.xml
index df901d183d..df901d183d 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/ipo.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/ipo.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/ipo.xsd
index af1e73172d..af1e73172d 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/order.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/order.wsdl
index a5ead60382..a5ead60382 100644
--- a/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/order.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-axiom/src/test/resources/order.wsdl
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/LICENSE
index d645695673..d645695673 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/NOTICE
index d83ebbe236..d83ebbe236 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/pom.xml
index 1f52b7b03a..1f52b7b03a 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
index fe724e3302..fe724e3302 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
index 3c8f352cd8..3c8f352cd8 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
index dde9a411eb..dde9a411eb 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
index cdb2f47d21..cdb2f47d21 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
index b323081364..b323081364 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
index af192579e0..af192579e0 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index ea47ee7191..ea47ee7191 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
index 1610b4f54d..1610b4f54d 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
index 18e97da2f0..18e97da2f0 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100644
--- a/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/pom.xml
index 1be9658e1c..1be9658e1c 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java
index 359d0fa20d..359d0fa20d 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
index d1a64a782c..d1a64a782c 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
index 12f44b479e..12f44b479e 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
index d34ee8b13c..d34ee8b13c 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java
index 8aaee84f80..8aaee84f80 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
index 4a240b3f55..4a240b3f55 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
index a8b98fc214..a8b98fc214 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
index c3e97a4818..c3e97a4818 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
index 05e420f1c6..05e420f1c6 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
index 61b3075539..61b3075539 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
index 79e8dc027f..79e8dc027f 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
index ef3112eb22..ef3112eb22 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 58d6123373..58d6123373 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 4e062e4c22..4e062e4c22 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java
index b121e2c99f..b121e2c99f 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBReflectionTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBReflectionTestCase.java
index 2efbfe3962..2efbfe3962 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBReflectionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBReflectionTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java
index 512e1c625f..512e1c625f 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java
index 563d6232b1..563d6232b1 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyBean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyBean.java
index 49fb38b1fa..49fb38b1fa 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyBean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyBean.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterface.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterface.java
index 2fc561b577..2fc561b577 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterface.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterfaceImpl.java
index 928acb9f3c..928acb9f3c 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterfaceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/POJOTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/POJOTestCase.java
index 9758292aea..9758292aea 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/POJOTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/POJOTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-jaxb/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/LICENSE
index d645695673..d645695673 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/pom.xml
index 51c057162e..51c057162e 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
index 51b84ef648..51b84ef648 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
index 340205a9e2..340205a9e2 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
index 5cc32e4172..5cc32e4172 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
index ec7ecb4dda..ec7ecb4dda 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
index fb29710506..fb29710506 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
index 2fff9cc7cd..2fff9cc7cd 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
index e6b082dc81..e6b082dc81 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
index 393cb3baad..393cb3baad 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
index 8a5e0385ec..8a5e0385ec 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
index 22ada81565..22ada81565 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
index adc38772be..adc38772be 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
index 50086550a3..50086550a3 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index b0baaeb398..b0baaeb398 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 4ce2f2342a..4ce2f2342a 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
index 820025933f..820025933f 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
index 3b36f5be74..3b36f5be74 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
index 60b293c1d4..60b293c1d4 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
index 07af72f8b5..07af72f8b5 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
index 3a2b95a4e2..3a2b95a4e2 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
index 84995baadf..84995baadf 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-json/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100644
--- a/branches/sca-java-1.2.1/modules/databinding-json/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-json/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/LICENSE
index d645695673..d645695673 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/pom.xml
index d4137b4a05..d4137b4a05 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
index 40deb05a6d..40deb05a6d 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
index 97ab0fe4eb..97ab0fe4eb 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
index 2b123b4db7..2b123b4db7 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
index 1808b8d926..1808b8d926 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
index 1a160512bf..1a160512bf 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
index bebd706d49..bebd706d49 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
index 9d1e85bcc1..9d1e85bcc1 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
index b27da5373a..b27da5373a 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
index 93cd537a42..93cd537a42 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
index b9b4b513c1..b9b4b513c1 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
index b14ca57589..b14ca57589 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index d895237c7d..d895237c7d 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 671d07afd8..671d07afd8 100644
--- a/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/pom.xml
index 93f5e7cdb2..93f5e7cdb2 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
index 8695d096c2..8695d096c2 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
index ef6b5b0bf2..ef6b5b0bf2 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
index 16a6607052..16a6607052 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
index 1f3384efd8..1f3384efd8 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index c870ec2406..c870ec2406 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
index d3a1c3f656..d3a1c3f656 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
index f5182f465c..f5182f465c 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
index e141e27098..e141e27098 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/resources/stock.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
index a0a6717371..a0a6717371 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/pom.xml
index 19bafdcba1..19bafdcba1 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
index 77b879809a..77b879809a 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
index 4d4daa0905..4d4daa0905 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
index 5ea4a0cb61..5ea4a0cb61 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
index 30a3e1c3a9..30a3e1c3a9 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
index d549c91cbf..d549c91cbf 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
index dc8a822064..dc8a822064 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
index ea851860e5..ea851860e5 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
index d6e4edf28e..d6e4edf28e 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
index f2b01a7e4e..f2b01a7e4e 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
index d97f201b15..d97f201b15 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
index 9ffa86578b..9ffa86578b 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
index dcd9242f30..dcd9242f30 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
index cdd8d4e131..cdd8d4e131 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
index 27f440c5c2..27f440c5c2 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
index 831f565a1b..831f565a1b 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ffe8b895b8..ffe8b895b8 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index afd00b552c..afd00b552c 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index b1916fd32a..b1916fd32a 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
index c5d87d2c3c..c5d87d2c3c 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
index 5fa9e81e76..5fa9e81e76 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
index 3665434cee..3665434cee 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
index 846ceaf377..846ceaf377 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
index 405053960b..405053960b 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
index a41dc585d9..a41dc585d9 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
index f5c26bf9f5..f5c26bf9f5 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
index 799e0c2388..799e0c2388 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
index ce04f5be3f..ce04f5be3f 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
index 78bc62eb3a..78bc62eb3a 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/model/sca-core.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
index 56c6977254..56c6977254 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
index bbaf58f00c..bbaf58f00c 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/stock.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/stock.xsd
index a0a6717371..a0a6717371 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/stock.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/stock.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/wrapper.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/wrapper.xml
index 2526629409..2526629409 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/wrapper.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/wrapper.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/wrapper.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/wrapper.xsd
index ea4dc5f7f3..ea4dc5f7f3 100644
--- a/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/wrapper.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-sdo/src/test/resources/wrapper.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/LICENSE
index d645695673..d645695673 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/pom.xml
index bd9c34d87c..bd9c34d87c 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
index 4130dcb4df..4130dcb4df 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
index eaf4fb4902..eaf4fb4902 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
index a4f32c5cb1..a4f32c5cb1 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
index 800fae9780..800fae9780 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
index 4fd961c52e..4fd961c52e 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 907d06559a..907d06559a 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 4e419de051..4e419de051 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
index 3b62a99021..3b62a99021 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
index a397182672..a397182672 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/pom.xml
index b2cc6d67e2..b2cc6d67e2 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObject.java
index 830cb8108d..830cb8108d 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObject.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObjectImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObjectImpl.java
index df7df3d2b1..df7df3d2b1 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObjectImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObjectImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Node2XObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Node2XObject.java
index 548d0b8df1..548d0b8df1 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Node2XObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Node2XObject.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/OMElement2XObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/OMElement2XObject.java
index e606507a9f..e606507a9f 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/OMElement2XObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/OMElement2XObject.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Utils.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Utils.java
index 2de353312a..2de353312a 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Utils.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Utils.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject.java
index 1e3ab7a188..1e3ab7a188 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2Node.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2Node.java
index a284b5b0af..a284b5b0af 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2Node.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2OMElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2OMElement.java
index ebd282fd40..ebd282fd40 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2OMElement.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java
index a371c09c25..a371c09c25 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index f501ef2dc6..f501ef2dc6 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index a733ad7b7d..a733ad7b7d 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/ipo.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/ipo.xml
index 1699538d62..1699538d62 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/ipo.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/ipo.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/ipo.xsd
index aac7ded180..aac7ded180 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/order.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/order.wsdl
index 65da5b602a..65da5b602a 100644
--- a/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/order.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding-xstream/src/test/resources/order.wsdl
diff --git a/branches/sca-java-1.2.1/modules/databinding/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/databinding/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/databinding/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/LICENSE
index 616bec99ed..616bec99ed 100644
--- a/branches/sca-java-1.2.1/modules/databinding/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/databinding/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/databinding/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/databinding/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/pom.xml
index 90e5faae61..90e5faae61 100644
--- a/branches/sca-java-1.2.1/modules/databinding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
index b8089dc529..b8089dc529 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
index 205843e2be..205843e2be 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
index 69a0e4510a..69a0e4510a 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
index 4486117d31..4486117d31 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
index 4eceba71fa..4eceba71fa 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
index 05e7af946b..05e7af946b 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
index 168a1052b3..168a1052b3 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
index feed87e45f..feed87e45f 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
index 80e5e4f0a3..80e5e4f0a3 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
index 70ea431d57..70ea431d57 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
index 27818dc24f..27818dc24f 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
index 8d2b36482d..8d2b36482d 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
index 062f087a15..062f087a15 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
index aa3db5364c..aa3db5364c 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
index 379a967c9c..379a967c9c 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
index 4405077e29..4405077e29 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
index 650e909c61..650e909c61 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
index d3d3c6336f..d3d3c6336f 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
index 87b4a79450..87b4a79450 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
index 0efb7e41b5..0efb7e41b5 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/CallableReference2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/CallableReference2XMLStreamReader.java
index ac711ca7a7..ac711ca7a7 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/CallableReference2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/CallableReference2XMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/CallableReferenceDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/CallableReferenceDataBinding.java
index f020abdeb0..f020abdeb0 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/CallableReferenceDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/CallableReferenceDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
index 14d5c1763d..14d5c1763d 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
index 50cedc64c6..50cedc64c6 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
index d1dd6f28f0..d1dd6f28f0 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
index 2bb39d9582..2bb39d9582 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
index 50b5bf6e8d..50b5bf6e8d 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
index 56eabc8904..56eabc8904 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
index e2db8c5834..e2db8c5834 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
index 5d7776fa78..5d7776fa78 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
index c36ebb04c5..c36ebb04c5 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
index a6c0639411..a6c0639411 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XMLStreamReader2CallableReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XMLStreamReader2CallableReference.java
index 74d92135d8..74d92135d8 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XMLStreamReader2CallableReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XMLStreamReader2CallableReference.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
index 310d1e6c00..310d1e6c00 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
index 4517d7eeb2..4517d7eeb2 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
index a38a602544..a38a602544 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
index 845d88fc06..845d88fc06 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
index 5e18fddfc8..5e18fddfc8 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
index 46ac413c9f..46ac413c9f 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
index 60bffb5709..60bffb5709 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
index 1b1c2f17d3..1b1c2f17d3 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
index 47c178abff..47c178abff 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
index 48a3b593fd..48a3b593fd 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
index 8331fa425a..8331fa425a 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
index 63b8faddb4..63b8faddb4 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
index 18d7235be8..18d7235be8 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
index 849912dc80..849912dc80 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
index 8c7a742cdd..8c7a742cdd 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java
index 507c141c33..507c141c33 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
index 40d5c07499..40d5c07499 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
index 2a6094a76a..2a6094a76a 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
index d842048d81..d842048d81 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
index 2ec864fbbd..2ec864fbbd 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
index 06b2521d47..06b2521d47 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
index 157a95025d..157a95025d 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
index 71af7519e7..71af7519e7 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
index 04d7d65a0d..04d7d65a0d 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
index abc4bf3785..abc4bf3785 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
index 3e20e0be70..3e20e0be70 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
index f20cd4f901..f20cd4f901 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
index b07e6eb955..b07e6eb955 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
index 2b26c11d50..2b26c11d50 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
index 6b0afde322..6b0afde322 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
index aa96877c02..aa96877c02 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
index bf8edc47f9..bf8edc47f9 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
index 6cdbc82d9d..6cdbc82d9d 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
index 35c20c28c0..35c20c28c0 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
index 486f1f256a..486f1f256a 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
index c1a06e335c..c1a06e335c 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
index b502b5003f..b502b5003f 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
index 6257681091..6257681091 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
index a76cd21f1d..a76cd21f1d 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
index 103ecbd7d1..103ecbd7d1 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
index f5fd229ae5..f5fd229ae5 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
index 902fddc234..902fddc234 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
index 776bae535c..776bae535c 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
index 6dc78eefdb..6dc78eefdb 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
index b08a374df8..b08a374df8 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
index 3ec97a9049..3ec97a9049 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
index e2bebd0eb0..e2bebd0eb0 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
index a42d6acc9a..a42d6acc9a 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
index 372d57a567..372d57a567 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
index 68b442bb3e..68b442bb3e 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
index 909e8ad57d..909e8ad57d 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
index 8d12b2574e..8d12b2574e 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
index fd1cab54b3..fd1cab54b3 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
index 4e07043b3d..4e07043b3d 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
index f32f93d098..f32f93d098 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
index 21307909a7..21307909a7 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java
index 283aa573d2..283aa573d2 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
index 8d4c22e742..8d4c22e742 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java
index f235d77b5b..f235d77b5b 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 1dd6c7fc0b..1dd6c7fc0b 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
index 568e04f9de..568e04f9de 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index d53cf4ca55..d53cf4ca55 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
index e02cd5c934..e02cd5c934 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
index 7d8642fb1e..7d8642fb1e 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
index d210ad1371..d210ad1371 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
index 174202842a..174202842a 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
index 4e321f2055..4e321f2055 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
index aae7bf33b7..aae7bf33b7 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
index 31eed42c06..31eed42c06 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
index 1aa90cce1b..1aa90cce1b 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
index 1dc91374ea..1dc91374ea 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
index 7f640223b7..7f640223b7 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
index eddab9294f..eddab9294f 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
index 227f3ac909..227f3ac909 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
index 4c3d4e3327..4c3d4e3327 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
index a39eef93e4..a39eef93e4 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
index b7184cef9c..b7184cef9c 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
index 350b546a15..350b546a15 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
index 3627b2d094..3627b2d094 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
index 21d584e16c..21d584e16c 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
index 0deb06f577..0deb06f577 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
index b5758d2149..b5758d2149 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
index c4e461d68f..c4e461d68f 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
index 92a576fb98..92a576fb98 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
index 100890e10b..100890e10b 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
diff --git a/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
index 0ba8ade1e0..0ba8ade1e0 100644
--- a/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/pom.xml
index 5fe1cf3eeb..5fe1cf3eeb 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
index 049b3d60ef..049b3d60ef 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
index 7cb9087bd5..7cb9087bd5 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsResolver.java
index 02fc114e24..02fc114e24 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsResolver.java
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 6ed79d85b4..6ed79d85b4 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/MockPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/MockPolicyProcessor.java
index 467cc6cbe9..467cc6cbe9 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/MockPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/MockPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java
index 700d3d9d12..700d3d9d12 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
index 7fb3810618..7fb3810618 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
index 3728e8f2b4..3728e8f2b4 100644
--- a/branches/sca-java-1.2.1/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/definitions/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/definitions/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/definitions/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/definitions/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/definitions/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/definitions/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/definitions/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/pom.xml
index eef42c639b..eef42c639b 100644
--- a/branches/sca-java-1.2.1/modules/definitions/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java
index c1b8b03a19..c1b8b03a19 100644
--- a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java
diff --git a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java
index 0fad38b554..0fad38b554 100644
--- a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java
index aeef85b45a..aeef85b45a 100644
--- a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java
diff --git a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java
index 42f6acb3e2..42f6acb3e2 100644
--- a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProvider.java
index f53cf8cd3b..f53cf8cd3b 100644
--- a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProvider.java
diff --git a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProviderException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProviderException.java
index dbf463f2b0..dbf463f2b0 100644
--- a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProviderException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProviderException.java
diff --git a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProviderExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProviderExtensionPoint.java
index 2e6b9ed137..2e6b9ed137 100644
--- a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProviderExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsProviderExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefaultSCADefinitionsProviderExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefaultSCADefinitionsProviderExtensionPoint.java
index c36411e4bd..c36411e4bd 100644
--- a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefaultSCADefinitionsProviderExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefaultSCADefinitionsProviderExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java
index f46883d888..f46883d888 100644
--- a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java
diff --git a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
index 66a9803fae..66a9803fae 100644
--- a/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
diff --git a/branches/sca-java-1.2.1/modules/definitions/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProviderExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProviderExtensionPoint
index 3d2a990593..3d2a990593 100644
--- a/branches/sca-java-1.2.1/modules/definitions/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProviderExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/definitions/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProviderExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/domain-api/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/domain-api/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/domain-api/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/domain-api/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/domain-api/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/domain-api/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/domain-api/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/pom.xml
index 82846bbf00..82846bbf00 100644
--- a/branches/sca-java-1.2.1/modules/domain-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/DomainException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/DomainException.java
index 1a62801b1b..1a62801b1b 100644
--- a/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/DomainException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/DomainException.java
diff --git a/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomain.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomain.java
index e88a18a534..e88a18a534 100644
--- a/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomain.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomain.java
diff --git a/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomainFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomainFactory.java
index 860ab0171b..860ab0171b 100644
--- a/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomainFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomainFactory.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/NOTICE
index ad02e27c39..ad02e27c39 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/pom.xml
index 32497f8691..32497f8691 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainFactoryImpl.java
index 23483bede2..23483bede2 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
index e5f2152b3a..e5f2152b3a 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADummyNodeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADummyNodeImpl.java
index 680ba1b80a..680ba1b80a 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADummyNodeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADummyNodeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/launch/SCADomainControllerLauncher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/launch/SCADomainControllerLauncher.java
index dadf05a49b..dadf05a49b 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/launch/SCADomainControllerLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/launch/SCADomainControllerLauncher.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/ContributionInfoImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/ContributionInfoImpl.java
index 0ce961ae27..0ce961ae27 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/ContributionInfoImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/ContributionInfoImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/DomainInfoImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/DomainInfoImpl.java
index 4abbbd9466..4abbbd9466 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/DomainInfoImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/DomainInfoImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/NodeInfoImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/NodeInfoImpl.java
index 558439db99..558439db99 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/NodeInfoImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/NodeInfoImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/SCADomainManagerServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/SCADomainManagerServiceImpl.java
index b4e1ff5972..b4e1ff5972 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/SCADomainManagerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/SCADomainManagerServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/CompositeModelImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/CompositeModelImpl.java
index 12a140292d..12a140292d 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/CompositeModelImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/CompositeModelImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ContributionModelImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ContributionModelImpl.java
index 513df3e9db..513df3e9db 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ContributionModelImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ContributionModelImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelFactoryImpl.java
index 443e4b8b71..443e4b8b71 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelImpl.java
index 378495d259..378495d259 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/DomainModelImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/NodeModelImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/NodeModelImpl.java
index 0fde18ac97..0fde18ac97 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/NodeModelImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/NodeModelImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ServiceModelImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ServiceModelImpl.java
index e99c31a3ee..e99c31a3ee 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ServiceModelImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/model/impl/ServiceModelImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/domain.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/domain.composite
index 29fe2815d9..29fe2815d9 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/domain.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/domain.composite
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/binding-jsonrpc.js b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/binding-jsonrpc.js
index ca3c2a8605..ca3c2a8605 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/binding-jsonrpc.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/binding-jsonrpc.js
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/domain.png b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/domain.png
index e88c4f882a..e88c4f882a 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/domain.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/domain.png
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/index.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/index.html
index 4320a52b4c..4320a52b4c 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/index.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/index.html
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/node.png b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/node.png
index fa01e64272..fa01e64272 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/node.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/node.png
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/style.css b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/style.css
index f5bbf23379..f5bbf23379 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/style.css
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/main/resources/webroot/style.css
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/AddService.java
index d7dc4473ad..d7dc4473ad 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/AddServiceImpl.java
index e9b7e254e5..e9b7e254e5 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/CalculatorServiceImpl.java
index da869e00fd..da869e00fd 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/SubtractService.java
index 78ab9c6ee0..78ab9c6ee0 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/SubtractServiceImpl.java
index 1010207154..1010207154 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/DomainImplTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/DomainImplTestCase.java
index d4cfb5e1d9..d4cfb5e1d9 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/DomainImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/DomainImplTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestCallableReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestCallableReferenceImpl.java
index 985a788a02..985a788a02 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestCallableReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestCallableReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestNodeManagerServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestNodeManagerServiceImpl.java
index 86e3a84c6a..86e3a84c6a 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestNodeManagerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/TestNodeManagerServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeA/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeA/Calculator.composite
index 172676a3c7..172676a3c7 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeA/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeA/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml
index db255e0232..db255e0232 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeB/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeB/Calculator.composite
index b770dbe8d4..b770dbe8d4 100644
--- a/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeB/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain-impl/src/test/resources/nodeB/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/domain/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/domain/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/domain/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/domain/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/domain/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/domain/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/domain/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/pom.xml
index f855d83969..f855d83969 100644
--- a/branches/sca-java-1.2.1/modules/domain/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java
index 82d7d78b67..82d7d78b67 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainEventService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainEventService.java
index fd50ba348a..fd50ba348a 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainEventService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainEventService.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java
index c637b54189..c637b54189 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/ContributionInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/ContributionInfo.java
index 5db991edd1..5db991edd1 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/ContributionInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/ContributionInfo.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/DomainInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/DomainInfo.java
index b8c756b89f..b8c756b89f 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/DomainInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/DomainInfo.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/NodeInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/NodeInfo.java
index 0590cb6c30..0590cb6c30 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/NodeInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/NodeInfo.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.java
index c0ae892329..c0ae892329 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerService.java
index c908515aaf..c908515aaf 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerService.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/CompositeModel.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/CompositeModel.java
index 5a634da69f..5a634da69f 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/CompositeModel.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/CompositeModel.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ContributionModel.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ContributionModel.java
index dc3b031483..dc3b031483 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ContributionModel.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ContributionModel.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModel.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModel.java
index 3befc322b4..3befc322b4 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModel.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModel.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModelFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModelFactory.java
index c6dd269f8b..c6dd269f8b 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModelFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModelFactory.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/NodeModel.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/NodeModel.java
index ad18bc9e40..ad18bc9e40 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/NodeModel.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/NodeModel.java
diff --git a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ServiceModel.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ServiceModel.java
index cc097f835c..cc097f835c 100644
--- a/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ServiceModel.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ServiceModel.java
diff --git a/branches/sca-java-1.2.1/modules/extensibility/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/DISCLAIMER
index 8e5c524323..8e5c524323 100644
--- a/branches/sca-java-1.2.1/modules/extensibility/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/extensibility/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/extensibility/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/extensibility/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/NOTICE
index b3e4797aaa..b3e4797aaa 100644
--- a/branches/sca-java-1.2.1/modules/extensibility/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/extensibility/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/pom.xml
index 08c2c51e4f..08c2c51e4f 100644
--- a/branches/sca-java-1.2.1/modules/extensibility/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
index cb8f6ac18d..cb8f6ac18d 100644
--- a/branches/sca-java-1.2.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
diff --git a/branches/sca-java-1.2.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
index e74eb0a7e3..e74eb0a7e3 100644
--- a/branches/sca-java-1.2.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/pom.xml
index aacd0cb0a7..aacd0cb0a7 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java
index 2eeccd7e4a..2eeccd7e4a 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java
index 75494cd02c..75494cd02c 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java
index 3b508b8ffd..3b508b8ffd 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java
index 1c98c41fb4..1c98c41fb4 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java
index 4fadd5895a..4fadd5895a 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java
index 78eacc41f1..78eacc41f1 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java
index 8944feba3d..8944feba3d 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java
index 04b40a6133..04b40a6133 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java
index 86fb752f10..86fb752f10 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java
index 7baffacc32..7baffacc32 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java
index 0169dbe9ec..0169dbe9ec 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java
index a23f3a2ec0..a23f3a2ec0 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java
index 7369e81c66..7369e81c66 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java
index 11bfa7fc0d..11bfa7fc0d 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java
index 37132e3f95..37132e3f95 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java
index d68e2dcb6b..d68e2dcb6b 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java
index 010a647ee7..010a647ee7 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java
index 8f032c68f5..8f032c68f5 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java
index 683786c97e..683786c97e 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java
diff --git a/branches/sca-java-1.2.1/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index a408b0d061..a408b0d061 100644
--- a/branches/sca-java-1.2.1/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/pom.xml
index fad8e53271..fad8e53271 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
index c1d80be772..c1d80be772 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
index 9ee7c274fd..9ee7c274fd 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
index c74d0aad87..c74d0aad87 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
index 8a512de5f8..8a512de5f8 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
index 40f2069379..40f2069379 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
index 8827a92387..8827a92387 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
index e6ced00e1d..e6ced00e1d 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
index 60fc6dae2b..60fc6dae2b 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
index ab6f4680e6..ab6f4680e6 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
index 452f1a1ab1..452f1a1ab1 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
index 57b6a6d746..57b6a6d746 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
index 9252b114a1..9252b114a1 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
index c52c16d8e1..c52c16d8e1 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
index 087a75426b..087a75426b 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
index 2a59635a19..2a59635a19 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
index 9b099cd419..9b099cd419 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
index 86e0cb6a8a..86e0cb6a8a 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
index 46fcdaf5e1..46fcdaf5e1 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
index 9200d850bb..9200d850bb 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
index 4adec91151..4adec91151 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
index 78f9654f1b..78f9654f1b 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
index 9388bc48cf..9388bc48cf 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
index 35554f907a..35554f907a 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
index 20957a352e..20957a352e 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
index 352cf192df..352cf192df 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java
index d49179dec0..d49179dec0 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 7e2e11e4cc..7e2e11e4cc 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/test.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/test.composite
index bd7c5fab79..bd7c5fab79 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/test.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/test.composite
diff --git a/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/test.txt b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/test.txt
index 287f9b1f65..287f9b1f65 100644
--- a/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/test.txt
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-embedded/src/test/resources/test.txt
diff --git a/branches/sca-java-1.2.1/modules/host-http/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/host-http/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/host-http/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/host-http/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/host-http/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/host-http/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/host-http/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/pom.xml
index 76313c20c6..76313c20c6 100644
--- a/branches/sca-java-1.2.1/modules/host-http/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
index ec530c7fa4..ec530c7fa4 100644
--- a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
diff --git a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
index 8f20287f84..8f20287f84 100644
--- a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
index e53b5fd6de..e53b5fd6de 100644
--- a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
diff --git a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
index 4f51198d27..4f51198d27 100644
--- a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
diff --git a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
index f887151a77..f887151a77 100644
--- a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
index b061f171b9..b061f171b9 100644
--- a/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
diff --git a/branches/sca-java-1.2.1/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
index 44f4550b40..44f4550b40 100644
--- a/branches/sca-java-1.2.1/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/host-jetty/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/host-jetty/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/host-jetty/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/host-jetty/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/host-jetty/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/host-jetty/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/host-jetty/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/pom.xml
index de75fce346..de75fce346 100644
--- a/branches/sca-java-1.2.1/modules/host-jetty/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
index 448318307a..448318307a 100644
--- a/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
diff --git a/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
index 1ecf1bca1b..1ecf1bca1b 100644
--- a/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
diff --git a/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
index 3864102e9f..3864102e9f 100644
--- a/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
diff --git a/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
index 11b8a269ab..11b8a269ab 100644
--- a/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index f61708de90..f61708de90 100644
--- a/branches/sca-java-1.2.1/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
index e22559cc9c..e22559cc9c 100644
--- a/branches/sca-java-1.2.1/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/host-jetty/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-java-1.2.1/modules/host-jetty/src/test/resources/content/test.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-jetty/src/test/resources/content/test.html
diff --git a/branches/sca-java-1.2.1/modules/host-osgi/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/host-osgi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/host-osgi/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/LICENSE
index 4b5ab74408..4b5ab74408 100644
--- a/branches/sca-java-1.2.1/modules/host-osgi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/host-osgi/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/NOTICE
index a3c65715e5..a3c65715e5 100644
--- a/branches/sca-java-1.2.1/modules/host-osgi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/host-osgi/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/pom.xml
index e90b45d7e9..e90b45d7e9 100644
--- a/branches/sca-java-1.2.1/modules/host-osgi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 8bab603184..8bab603184 100644
--- a/branches/sca-java-1.2.1/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/pom.xml
index 0aa073d0ed..0aa073d0ed 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
index d7ea6ae796..d7ea6ae796 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
index 3ac086a2ee..3ac086a2ee 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
index 32fe6c2deb..32fe6c2deb 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
index dcda47f51d..dcda47f51d 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
index 8f1c4a253f..8f1c4a253f 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
index 60804c1003..60804c1003 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
index f2c74711e0..f2c74711e0 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
index 014c5391b8..014c5391b8 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
diff --git a/branches/sca-java-1.2.1/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
index f08e6c7063..f08e6c7063 100644
--- a/branches/sca-java-1.2.1/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/host-tomcat/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/host-tomcat/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/host-tomcat/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/host-tomcat/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/host-tomcat/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/host-tomcat/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/host-tomcat/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/pom.xml
index 99b3fa9090..99b3fa9090 100644
--- a/branches/sca-java-1.2.1/modules/host-tomcat/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
index b1dd818371..b1dd818371 100644
--- a/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
diff --git a/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
index 29b3da5880..29b3da5880 100644
--- a/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
diff --git a/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
index eb9f4fd1e0..eb9f4fd1e0 100644
--- a/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
diff --git a/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
index 9309e89d60..9309e89d60 100644
--- a/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index f0f4e17507..f0f4e17507 100644
--- a/branches/sca-java-1.2.1/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
index 14bc5cb385..14bc5cb385 100644
--- a/branches/sca-java-1.2.1/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/host-tomcat/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-java-1.2.1/modules/host-tomcat/src/test/resources/content/test.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-tomcat/src/test/resources/content/test.html
diff --git a/branches/sca-java-1.2.1/modules/host-webapp-junit/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp-junit/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/host-webapp-junit/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp-junit/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/host-webapp-junit/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp-junit/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/host-webapp-junit/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/pom.xml
index f4c4c2b37a..f4c4c2b37a 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp-junit/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
index 3ef8cff2d8..3ef8cff2d8 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
diff --git a/branches/sca-java-1.2.1/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java
index a670834307..a670834307 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/pom.xml
index 9d97d35281..9d97d35281 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java
index e6300c81b9..e6300c81b9 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java
index 7de0d48db5..7de0d48db5 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
index d08545f20c..d08545f20c 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java
index c2d8826ffc..c2d8826ffc 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
index 7750c31967..7750c31967 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java
index 09b11145d6..09b11145d6 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
index e859e4fe42..e859e4fe42 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
index 6845d2b94a..6845d2b94a 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebSCADomain.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebSCADomain.java
index be35733220..be35733220 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebSCADomain.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebSCADomain.java
diff --git a/branches/sca-java-1.2.1/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index d99fdf257e..d99fdf257e 100644
--- a/branches/sca-java-1.2.1/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/LICENSE
index 4b5ab74408..4b5ab74408 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/NOTICE
index a3c65715e5..a3c65715e5 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/pom.xml
index 87b695c07a..87b695c07a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
index c47888de17..c47888de17 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
index 494498804d..494498804d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
index 3ff9e5fb06..3ff9e5fb06 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/DefaultBPELFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/DefaultBPELFactory.java
index d574f6e422..d574f6e422 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/DefaultBPELFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/DefaultBPELFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELDocumentProcessor.java
index a40d91b9bc..a40d91b9bc 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELDocumentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
index 3442d86c4e..3442d86c4e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java
index e1144186be..e1144186be 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
index 98405c3489..98405c3489 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ODEProcessException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ODEProcessException.java
index b54b8b01c4..b54b8b01c4 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ODEProcessException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ODEProcessException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ThreadRuntimeComponentContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ThreadRuntimeComponentContext.java
index c16201b147..c16201b147 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ThreadRuntimeComponentContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/ThreadRuntimeComponentContext.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
index 661f79f78d..661f79f78d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
index ad6e0cf3b7..ad6e0cf3b7 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
index 96083614ff..96083614ff 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
index 2677f38c88..2677f38c88 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
index b03f69d9aa..b03f69d9aa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
index 2fa91e4e86..2fa91e4e86 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
index d8f54e479a..d8f54e479a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
index a928379ba9..a928379ba9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
index 654b33ba2e..654b33ba2e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java
index 01b3cd772d..01b3cd772d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java
index b4189da2ca..b4189da2ca 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 4763c69768..4763c69768 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 066fdc864b..066fdc864b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
index 53ffd1b72a..53ffd1b72a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index b6481b1512..b6481b1512 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
index 6aba1f27d9..6aba1f27d9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
index b52a75012f..b52a75012f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java
index 29f5cb74fc..29f5cb74fc 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/deploy.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/deploy.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/deploy.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
index 1d71727b2d..1d71727b2d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/log4j.properties
index 6c7c7e7ab1..6c7c7e7ab1 100644
--- a/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/log4j.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-bpel/src/test/resources/log4j.properties
diff --git a/branches/sca-java-1.2.1/modules/implementation-data-api/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-data-api/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-data-api/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-data-api/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-data-api/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-data-api/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-data-api/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/pom.xml
index 6091847b1e..6091847b1e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-data-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java
index 98204a8324..98204a8324 100644
--- a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java
index bf2bbc1812..bf2bbc1812 100644
--- a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java
index d0b9d942c1..d0b9d942c1 100644
--- a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java
index d441437791..d441437791 100644
--- a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java
index b849aa2405..b849aa2405 100644
--- a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java
index 11d51dcd06..11d51dcd06 100644
--- a/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/pom.xml
index 6df6e77dea..6df6e77dea 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
index 3c8822db1b..3c8822db1b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ae6db609a2..ae6db609a2 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
index 8bf4e89ca8..8bf4e89ca8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java
index f124c9883c..f124c9883c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite
index 0c1368c4dd..0c1368c4dd 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb-xml/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/pom.xml
index 8e20abe34a..8e20abe34a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java
index 5e031c6c38..5e031c6c38 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java
index bf9e13069b..bf9e13069b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java
index 050d0cf17a..050d0cf17a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java
index 87c29aa5b4..87c29aa5b4 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/provider/EJBImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/provider/EJBImplementationProviderFactory.java
index 58b537dbc8..58b537dbc8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/provider/EJBImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/provider/EJBImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory
index fb828707a6..fb828707a6 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index ac4ebe87fb..ac4ebe87fb 100644
--- a/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/pom.xml
index 82576859c0..82576859c0 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
index ac8af3ed64..ac8af3ed64 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
index a93710d266..a93710d266 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
index b5d3254fa0..b5d3254fa0 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
index 5285caa481..5285caa481 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
index 2513c63e38..2513c63e38 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
index d8eef18c74..d8eef18c74 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
index db5d346a68..db5d346a68 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
index 0f86dc6ae8..0f86dc6ae8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
index 4a8c8f31b8..4a8c8f31b8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
index 4d062859b9..4d062859b9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
index 04ba42ed88..04ba42ed88 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
index 8193bed8b1..8193bed8b1 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
index 9f587f58de..9f587f58de 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
index 6f8d07bf84..6f8d07bf84 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
index ca9c08fe63..ca9c08fe63 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
index 70c368a0e6..70c368a0e6 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
index 17450f43cb..17450f43cb 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
index 5d4d999453..5d4d999453 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
index f94b24762a..f94b24762a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
index 25c09231c5..25c09231c5 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
index e6ebb5abc3..e6ebb5abc3 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
index 135fde09ff..135fde09ff 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
index 8117549092..8117549092 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
index 2903cc6fc8..2903cc6fc8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
index ad2295fbda..ad2295fbda 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
index 4a5ad98e5b..4a5ad98e5b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
index 423abab416..423abab416 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
index d2df124958..d2df124958 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
index fd0fc94770..fd0fc94770 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
index 23d42c5616..23d42c5616 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
index ebf8a707b0..ebf8a707b0 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
index f0bf0b738d..f0bf0b738d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
index 339ab2743e..339ab2743e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
index cc3f317f9e..cc3f317f9e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
index 9ba4db063e..9ba4db063e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 0871ddf4be..0871ddf4be 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
index ba8da101c6..ba8da101c6 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
index 628a308c86..628a308c86 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
index 29dcfa8169..29dcfa8169 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
index cc852cc677..cc852cc677 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
index 4de0a4e8c7..4de0a4e8c7 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
index 214779ed3f..214779ed3f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
index c470b8cf3d..c470b8cf3d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
index ed7a0e7d03..ed7a0e7d03 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
index c1650c3a83..c1650c3a83 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
index 40ad1b1e95..40ad1b1e95 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
index de371e09bb..de371e09bb 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
index 1fb7abb917..1fb7abb917 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
index 8a7040a616..8a7040a616 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
index a00b9e7109..a00b9e7109 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
index a5e12d181c..a5e12d181c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
index 08feb59c7a..08feb59c7a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
index 408cedb8be..408cedb8be 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/pom.xml
index 0e000dc832..0e000dc832 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
index 0e14a2a689..0e14a2a689 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
index 296debaae0..296debaae0 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ff43eebcfc..ff43eebcfc 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/AddService.java
index 4eeb30a9c2..4eeb30a9c2 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
index ea3e5341d5..ea3e5341d5 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
index 11e8974657..11e8974657 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
index 131c5a8014..131c5a8014 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
index 9c7e96a668..9c7e96a668 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
index a917896aeb..a917896aeb 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
index 4892481203..4892481203 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
index e328f024ea..e328f024ea 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
index ee1d7c3457..ee1d7c3457 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
index 7b408c553a..7b408c553a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
index a19c7def04..a19c7def04 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
index 0f4903720f..0f4903720f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
index a58fa0c072..a58fa0c072 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
index 5142737b32..5142737b32 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
index e49359f3ee..e49359f3ee 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/pom.xml
index 4e56280888..4e56280888 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
index c8b7c072ac..c8b7c072ac 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
index 7b849f9b47..7b849f9b47 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
index 2198a632c0..2198a632c0 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
index 1b6414167c..1b6414167c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
index 8228c80372..8228c80372 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
index 889d14164e..889d14164e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
index 30f7e43fa6..30f7e43fa6 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
index c0b04b4b4e..c0b04b4b4e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
index daabec499f..daabec499f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
index a6c3c16966..a6c3c16966 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
index a2e01316a8..a2e01316a8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
index c4c528f4f2..c4c528f4f2 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
index 1aca15ebb8..1aca15ebb8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
index 85c2f73f75..85c2f73f75 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
index 3dc79a0da5..3dc79a0da5 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
index 9596fe0808..9596fe0808 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
index 4a3ce0c343..4a3ce0c343 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
index c6e6b6e4d6..c6e6b6e4d6 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
index bc6551d45d..bc6551d45d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
index 556f0b77e9..556f0b77e9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
index e05df90343..e05df90343 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
index 177ceaa57c..177ceaa57c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
index d14c346480..d14c346480 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
index 89e32eb34d..89e32eb34d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
index 5f59a82401..5f59a82401 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
index 88a245cbf3..88a245cbf3 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
index 9b834e7e87..9b834e7e87 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
index 4325faef26..4325faef26 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
index b9e1923e73..b9e1923e73 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
index 300ad6817e..300ad6817e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
index 2d177b3f76..2d177b3f76 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
index 5619275b82..5619275b82 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
index 0993d84a4d..0993d84a4d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
index 05df03471c..05df03471c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
index f5696122df..f5696122df 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
index 6a0d60c92f..6a0d60c92f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
index 8f50852c2d..8f50852c2d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
index 54f7dfad1e..54f7dfad1e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
index 25196c56e5..25196c56e5 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
index ccfbaf0043..ccfbaf0043 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
index e130f4221d..e130f4221d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
index 9141151e28..9141151e28 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
index 91b97b2caf..91b97b2caf 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
index a1e1d01ab3..a1e1d01ab3 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
index 976b4da120..976b4da120 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
index e77a6beb0d..e77a6beb0d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
index debb5cbacc..debb5cbacc 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
index 7147da55b4..7147da55b4 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
index 29488eb3fe..29488eb3fe 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
index 453cfa35fe..453cfa35fe 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
index 1da8d15d04..1da8d15d04 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
index cf1b4a9830..cf1b4a9830 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
index a1f8a766ae..a1f8a766ae 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
index 3d43e39ce8..3d43e39ce8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
index e15f9a0d6a..e15f9a0d6a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
index a3d3889d30..a3d3889d30 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
index b82e0df117..b82e0df117 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
index e1ca3ea565..e1ca3ea565 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
index 57d224b2bf..57d224b2bf 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
index dc9de12632..dc9de12632 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
index fe93424d28..fe93424d28 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
index 5beb31f0f9..5beb31f0f9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
index e5abb07760..e5abb07760 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
index fa1527fbe5..fa1527fbe5 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
index 690869ccb8..690869ccb8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
index 8c10df2146..8c10df2146 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
index 365fb12afe..365fb12afe 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
index f77c9abad9..f77c9abad9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
index ac3259f37f..ac3259f37f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
index 4555736813..4555736813 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
index aa2671071c..aa2671071c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
index 657ad757e5..657ad757e5 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
index 09bcc7ab6c..09bcc7ab6c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
index c7f340bd46..c7f340bd46 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
index e98a8fec1f..e98a8fec1f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
index 58a18f9c7c..58a18f9c7c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
index 5381e0e175..5381e0e175 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
index be2b5aa56e..be2b5aa56e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
index 388a1aae8b..388a1aae8b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
index aad6b96cf9..aad6b96cf9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
index 632df7d48f..632df7d48f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
index 8d5e816a08..8d5e816a08 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
index d68b1530f0..d68b1530f0 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
index 7bb8e15696..7bb8e15696 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
index d7de4e522e..d7de4e522e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
index 23c9fd263b..23c9fd263b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
index da3d5083e2..da3d5083e2 100644
--- a/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/pom.xml
index 0ed5edf419..0ed5edf419 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
index edf2aefdde..edf2aefdde 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
index 2e94f72c91..2e94f72c91 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
index bfa2af61b1..bfa2af61b1 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java
index f22cea193e..f22cea193e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/PingServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/PingServiceImpl.java
index 05d82e4dfc..05d82e4dfc 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/PingServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/PingServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java
index 5895a8614d..5895a8614d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
index 6cdb18938e..6cdb18938e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java
index e2a3e4df92..e2a3e4df92 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java
index 2be25533d2..2be25533d2 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
index 6488f89c6c..6488f89c6c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 306b53be5b..306b53be5b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/resources/NodeDaemon.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/resources/NodeDaemon.composite
index a019fedd6d..a019fedd6d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/resources/NodeDaemon.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/main/resources/NodeDaemon.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
index c25e952b69..c25e952b69 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/resources/TestComposite.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
index 55644c27e5..55644c27e5 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/resources/TestNode.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/resources/TestNode.composite
index 201868ffb4..201868ffb4 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/resources/TestNode.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-runtime/src/test/resources/TestNode.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/pom.xml
index 3e0f23c809..3e0f23c809 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
index a15fec60d2..a15fec60d2 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
index 8db2ee6ea8..8db2ee6ea8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 9378db0875..9378db0875 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
index 9dc0670f6c..9dc0670f6c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
index b3209991d0..b3209991d0 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
index 55644c27e5..55644c27e5 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
index 92787d3ac1..92787d3ac1 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-node/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-node/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-node/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-node/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/pom.xml
index cbb0174bbb..cbb0174bbb 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
index d2283fc30a..d2283fc30a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
index fe23c40a3d..fe23c40a3d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
index 9c4fed689b..9c4fed689b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
index f79d6f9502..f79d6f9502 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
index 94ea610314..94ea610314 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
index c4644d0fee..c4644d0fee 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
index b8a63a3b16..b8a63a3b16 100644
--- a/branches/sca-java-1.2.1/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/pom.xml
index 37aec78258..37aec78258 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java
index 22d567b5ac..22d567b5ac 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java
index 96d33143c8..96d33143c8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java
index e804d14d23..e804d14d23 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java
index 0cca36855e..0cca36855e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java
index c8540ae7c1..c8540ae7c1 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java
index e2f2496091..e2f2496091 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java
index acb77eadd7..acb77eadd7 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java
index b439492bde..b439492bde 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java
index 818cd923c0..818cd923c0 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index f8f6975395..f8f6975395 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java
index 561499a43b..561499a43b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java
index f5fe1854f7..f5fe1854f7 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType
index 1fd952a0a8..1fd952a0a8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/LICENSE
index 6b0b1270ff..6b0b1270ff 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/pom.xml
index 75f4d964b5..75f4d964b5 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationInterface.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationInterface.java
index e8602918f9..e8602918f9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationInterface.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java
index b118cc7677..b118cc7677 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java
index cff2c86478..cff2c86478 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
index af09013b6e..af09013b6e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java
index c46ea0a465..c46ea0a465 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProviderFactory.java
index 329364ae58..329364ae58 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiInstanceWrapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiInstanceWrapper.java
index b6addced6f..b6addced6f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiInstanceWrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiInstanceWrapper.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiRemotableInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiRemotableInvoker.java
index 6ed60a3591..6ed60a3591 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiRemotableInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiRemotableInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTargetInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTargetInvoker.java
index a2637ef48b..a2637ef48b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTargetInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTargetInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java
index 21a6a8159f..21a6a8159f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
index 43ba8562f8..43ba8562f8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 0f2b028e87..0f2b028e87 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 0f0fa03f75..0f0fa03f75 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiPropertyTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiPropertyTestCase.java
index aecab00a9e..aecab00a9e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiPropertyTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTestCase.java
index 335083429d..335083429d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRuntimeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRuntimeTestCase.java
index e69de29bb2..e69de29bb2 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRuntimeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRuntimeTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
index e8d89fe02b..e8d89fe02b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
index 3e120f3767..3e120f3767 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
index 7a6181206f..7a6181206f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
index 9cd6119f73..9cd6119f73 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
index 58d6fb363e..58d6fb363e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
index 971ae85d45..971ae85d45 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
index 254ce99d59..254ce99d59 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/osgiproptest.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/osgiproptest.composite
index 0b31145407..0b31145407 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/osgiproptest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/osgiproptest.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/osgitest.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/osgitest.composite
index 5465eec8d9..5465eec8d9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/osgitest.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-osgi/src/test/resources/osgitest.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/pom.xml
index 9d597c7d64..9d597c7d64 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
index 194edfdbc4..194edfdbc4 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
index f1f685aa1d..f1f685aa1d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
index 95ac452c66..95ac452c66 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
index d4db8772e4..d4db8772e4 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
index 9cad0890a3..9cad0890a3 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
index a32bb22645..a32bb22645 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java
index 70b13e2629..70b13e2629 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
index d76626b26c..d76626b26c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
index 47e70b5581..47e70b5581 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index b5774c5c5b..b5774c5c5b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
index f77f723c3e..f77f723c3e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 656d8c2751..656d8c2751 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
index 03f10e78e8..03f10e78e8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/test/resources/content/test.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/test/resources/content/test.html
diff --git a/branches/sca-java-1.2.1/modules/implementation-resource/src/test/resources/resource.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/test/resources/resource.composite
index 4654056cd7..4654056cd7 100644
--- a/branches/sca-java-1.2.1/modules/implementation-resource/src/test/resources/resource.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-resource/src/test/resources/resource.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/LICENSE
index 4b5ab74408..4b5ab74408 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/NOTICE
index 5782e5ee9b..5782e5ee9b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/pom.xml
index 7aec0e3059..7aec0e3059 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
index 837e24c1d0..837e24c1d0 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java
index 4ceb847a7a..4ceb847a7a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java
index 55b215fedf..55b215fedf 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
index 9ac0e2c4fe..9ac0e2c4fe 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
index ebbe14abd8..ebbe14abd8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator
index c8152b606f..c8152b606f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
index e3f81dd19b..e3f81dd19b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java
index fd742f4279..fd742f4279 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java
index df9e7a5c46..df9e7a5c46 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.java
index 709114ebad..709114ebad 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java
index ab76b9ca3d..ab76b9ca3d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
index dedc8bce09..dedc8bce09 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
index 39161a447b..39161a447b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
index e86119b72e..e86119b72e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
index 9485f39faa..9485f39faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
index 56015b5f7c..56015b5f7c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.java
index e8a6cd9819..e8a6cd9819 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
index 2ccbd4d4b4..2ccbd4d4b4 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
index 79c204c759..79c204c759 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
index 8d9e7b119f..8d9e7b119f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
index 996978e196..996978e196 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
index 73fcd77b44..73fcd77b44 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
index bd18153be8..bd18153be8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
index 8220fcade8..8220fcade8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
index abd3ff311d..abd3ff311d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
index c2f1ce811d..c2f1ce811d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
index 3f72c6cf45..3f72c6cf45 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
index 454843ea6c..454843ea6c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
index 3c8b77e39f..3c8b77e39f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
index 9caf7a715f..9caf7a715f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
index 26c970a56b..26c970a56b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRef.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRef.composite
index 77ba095988..77ba095988 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRef.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRef.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite
index 4e71a4a3e6..4e71a4a3e6 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js
index beee72314d..beee72314d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.js b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.js
index 69a2f2e639..69a2f2e639 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.js
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
index ce377e4ed3..ce377e4ed3 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
index 4d32ed9f6b..4d32ed9f6b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorld.composite
index 7ddf517b96..7ddf517b96 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
index 13cb94d511..13cb94d511 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
index c641b82cd6..c641b82cd6 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
index bb0ddd002f..bb0ddd002f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
index 9f89bd373e..9f89bd373e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
index eac2ab283f..eac2ab283f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
index f5dd0f8fcf..f5dd0f8fcf 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
index 2f55995fd9..2f55995fd9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
index 26574c6266..26574c6266 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
index a3551cefc3..a3551cefc3 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
index f72c6e922f..f72c6e922f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
index bd754c8d2e..bd754c8d2e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
index 06f261015e..06f261015e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
index a7eb446d37..a7eb446d37 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
index 64df3ebbef..64df3ebbef 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
index 868cfa9eeb..868cfa9eeb 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
index f4cfffe75e..f4cfffe75e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
index 175bb79104..175bb79104 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
index 7581b633cc..7581b633cc 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
index 91085b9eb2..91085b9eb2 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
index 535164aae7..535164aae7 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
index 3edd075126..3edd075126 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
index 5d2216d583..5d2216d583 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
index ad0a932d26..ad0a932d26 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
index aee8bf991d..aee8bf991d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
diff --git a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
index 8cf63390b1..8cf63390b1 100644
--- a/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/pom.xml
index be89d80dca..be89d80dca 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java
index b550fc3229..b550fc3229 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java
index 2d298b1dd8..2d298b1dd8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java
index d1be4b4c18..d1be4b4c18 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java
index 45f00ce1af..45f00ce1af 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java
index dc532ce20d..dc532ce20d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java
index 1dd44cd752..1dd44cd752 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java
index 9dadcd2f49..9dadcd2f49 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
index fe855e0c21..fe855e0c21 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
index 56af997fae..56af997fae 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
index 33f3793920..33f3793920 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java
index d7724f1723..d7724f1723 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java
index ff6070fd19..ff6070fd19 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
index 45c26f5f42..45c26f5f42 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
index bfbdb04f5b..bfbdb04f5b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java
index 5d677b6c26..5d677b6c26 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java
index 3f98180498..3f98180498 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
index b39c5d674e..b39c5d674e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
index ae191d6b45..ae191d6b45 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
index ceee459e3e..ceee459e3e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
index b3f0b8bbf9..b3f0b8bbf9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
index 9e55f30b46..9e55f30b46 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
index 85b29e5684..85b29e5684 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
index 346299c580..346299c580 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 4b71cef6c4..4b71cef6c4 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index ab707cfd68..ab707cfd68 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.handlers b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
index db4158521d..db4158521d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.schemas b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
index b701b49c4e..b701b49c4e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
index e20f4e8158..e20f4e8158 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
index 6640b990ca..6640b990ca 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
index 5d5344cd13..5d5344cd13 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
index 0b7d2525cf..0b7d2525cf 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
index 249067ab2d..249067ab2d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
index 43bb685e32..43bb685e32 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
index 94f7e83f30..94f7e83f30 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
index 9603b50704..9603b50704 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
index 83a6898502..83a6898502 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
index 4aaac6fa6a..4aaac6fa6a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
index 1a93b1a8f9..1a93b1a8f9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
index 76926c44c9..76926c44c9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
index 1d91dc341e..1d91dc341e 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
index f3e45d766f..f3e45d766f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
index 3fd7e72be4..3fd7e72be4 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
index 48a5971711..48a5971711 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
index 0ad7b01e9d..0ad7b01e9d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
index 0733f49de8..0733f49de8 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
index c7feddf87f..c7feddf87f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
index d59205e066..d59205e066 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
index f366c6819f..f366c6819f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringSCAProperty-context.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringSCAProperty-context.xml
index a181446ffb..a181446ffb 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringSCAProperty-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/SpringSCAProperty-context.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml
index aef5a5524b..aef5a5524b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml
index fb9fb03692..fb9fb03692 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
index 79f4041fe6..79f4041fe6 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
index 87353b69ea..87353b69ea 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
index ebb693d243..ebb693d243 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
index 9f51277d22..9f51277d22 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
index b811122b41..b811122b41 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/test.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/test.xml
index 477ca69a38..477ca69a38 100644
--- a/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/test.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-spring/src/test/resources/test.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/DISCLAIMER
index 8e5c524323..8e5c524323 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/NOTICE
index ad02e27c39..ad02e27c39 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/pom.xml
index 4a618a19ca..4a618a19ca 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
index 204ac24caf..204ac24caf 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
index 7bb852ae0c..7bb852ae0c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
index 2493b97f5c..2493b97f5c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
index 2b946ff3ec..2b946ff3ec 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
index 5c442c1b37..5c442c1b37 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
index 35a0325e3f..35a0325e3f 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
index 49cf0eb3d2..49cf0eb3d2 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
index 0b081fc77b..0b081fc77b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java
index 75cb5ac3c7..75cb5ac3c7 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 6c167a6b31..6c167a6b31 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
index fc45baa16d..fc45baa16d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index d0f73cbdbb..d0f73cbdbb 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/binding-atom.js b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/binding-atom.js
index ef533d3fe9..ef533d3fe9 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/binding-atom.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/binding-atom.js
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/binding-jsonrpc.js b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/binding-jsonrpc.js
index ca3c2a8605..ca3c2a8605 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/binding-jsonrpc.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/main/resources/binding-jsonrpc.js
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
index a5b80ab16d..a5b80ab16d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/Catalog.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/Catalog.java
index 5b9cae88ac..5b9cae88ac 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/Catalog.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/Catalog.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/CatalogImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/CatalogImpl.java
index 539e7b0f26..539e7b0f26 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/CatalogImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/CatalogImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/ShoppingCartImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/ShoppingCartImpl.java
index 8ff421632a..8ff421632a 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/ShoppingCartImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/java/store/ShoppingCartImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/resources/content/store.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/resources/content/store.html
index c2277772bf..c2277772bf 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/resources/content/store.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/resources/content/store.html
diff --git a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/resources/widget.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/resources/widget.composite
index f23d6a20f5..f23d6a20f5 100644
--- a/branches/sca-java-1.2.1/modules/implementation-widget/src/test/resources/widget.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-widget/src/test/resources/widget.composite
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/LICENSE
index d645695673..d645695673 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/pom.xml
index 4fddcc4297..4fddcc4297 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java
index f310fce586..f310fce586 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java
index e5c032678d..e5c032678d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
index 6488e15b02..6488e15b02 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java
index 402309aa2c..402309aa2c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java
index a05cfae29b..a05cfae29b 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
index f0f3eb000d..f0f3eb000d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
index 5e77575c3c..5e77575c3c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java
index 8f3fefe806..8f3fefe806 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java
index 9f1c48847c..9f1c48847c 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
index ed64321bec..ed64321bec 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index a51995e56d..a51995e56d 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 7ccc08d1ee..7ccc08d1ee 100644
--- a/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/pom.xml
index 40f3f0e13e..40f3f0e13e 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
index ab4ce1587e..ab4ce1587e 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
index d75f8b2fde..d75f8b2fde 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
index 324fd34534..324fd34534 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
index 66f2322950..66f2322950 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
index 7e2d7f64a4..7e2d7f64a4 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
index 0520031f5a..0520031f5a 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
index 9b205c72e6..9b205c72e6 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
index 87f75cca39..87f75cca39 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/pom.xml
index 6dc88dadc3..6dc88dadc3 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
index 852f3dc3b5..852f3dc3b5 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
index fff3dcf83a..fff3dcf83a 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index b3e52e5709..b3e52e5709 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
index 3cb605a388..3cb605a388 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
index 1624765b1d..1624765b1d 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
index 3de6410596..3de6410596 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
index dca38c9224..dca38c9224 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
index 23ebf576e5..23ebf576e5 100644
--- a/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-1.2.1/modules/interface-java/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/interface-java/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/interface-java/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/interface-java/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/pom.xml
index 07ee3b10cb..07ee3b10cb 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
index d0c5b66fdb..d0c5b66fdb 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
index 8a0292290a..8a0292290a 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
index e3a84c63f0..e3a84c63f0 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
index 9225926269..9225926269 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
index 2045d6d036..2045d6d036 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
index d43ebe558b..d43ebe558b 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
index e3ced406be..e3ced406be 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
index 2b5beb9087..2b5beb9087 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
index 8ee442f4fe..8ee442f4fe 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
index e98ba889d3..e98ba889d3 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
index 5d8a5689b3..5d8a5689b3 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
index 3bc03a528e..3bc03a528e 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
index 5ba12ec137..5ba12ec137 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
index 66f98adce3..66f98adce3 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
index f90a5cb8a1..f90a5cb8a1 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
index 14ac8b0134..14ac8b0134 100644
--- a/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/pom.xml
index 1a09307b3f..1a09307b3f 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelper.java
index 099d5d1534..099d5d1534 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelper.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelperTestCase.java
index 3988959af0..3988959af0 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelperTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/pom.xml
index 69cf9d3d36..69cf9d3d36 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
index 7de5d5349f..7de5d5349f 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
index 202a5ad8a4..202a5ad8a4 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
index 17686cafc0..17686cafc0 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
index fa32e5bb54..fa32e5bb54 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelper.java
index 61fbf45986..61fbf45986 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelper.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessor.java
index 02c5593f86..02c5593f86 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDModelResolver.java
index d44c6f4dff..d44c6f4dff 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 9666a6dbd8..9666a6dbd8 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 15ae762172..15ae762172 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 9c663a14ce..9c663a14ce 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
index ca0959b229..ca0959b229 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
index 966ffc25e2..966ffc25e2 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
index 7b41e0f7aa..7b41e0f7aa 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
index a82a022088..a82a022088 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
index 43a9d0fe49..43a9d0fe49 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
index 5cad523218..5cad523218 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
index 3696c8f073..3696c8f073 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
index 57d22fe18d..57d22fe18d 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
index e8fb4c6385..e8fb4c6385 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessorTestCase.java
index 9d4ee87ece..9d4ee87ece 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
index 875fdf35d2..875fdf35d2 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
index 3eb81b61bd..3eb81b61bd 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
index aea7046a3d..aea7046a3d 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
index 5e8e5dad0d..5e8e5dad0d 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
index ad81fc7867..ad81fc7867 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
index 39cd5547d9..39cd5547d9 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
index 8e26f7b4b5..8e26f7b4b5 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
index c2210f4a94..c2210f4a94 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
index 529b395fd5..529b395fd5 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
index 666a7e4069..666a7e4069 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl
index b0b6644e7f..b0b6644e7f 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl
index 0a7979e308..0a7979e308 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd
index 635ca25bfc..635ca25bfc 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd
index bb0c9bc7b7..bb0c9bc7b7 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd
index 300de931ec..300de931ec 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/pom.xml
index 64c6423d5a..64c6423d5a 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
index 8f75de59e2..8f75de59e2 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
index 33244e6087..33244e6087 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
index 9e4f6d5d2b..9e4f6d5d2b 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
index c50a4a5738..c50a4a5738 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
index 59db17116b..59db17116b 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
index c17da530b2..c17da530b2 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java
index d73cccb714..d73cccb714 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/XSDefinition.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/XSDefinition.java
index 438873a9fc..438873a9fc 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/XSDefinition.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/XSDefinition.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
index 1e7b4faa32..1e7b4faa32 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
index 4c5ea26ec2..4c5ea26ec2 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
index 6ab2f0a670..6ab2f0a670 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
index e10bc0d178..e10bc0d178 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
index 3719bbd79a..3719bbd79a 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
index 40be15c18d..40be15c18d 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java
index b41d79c3ba..b41d79c3ba 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java
index 1758b41fda..1758b41fda 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
index 6199821ff4..6199821ff4 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/XSDefinitionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/XSDefinitionImpl.java
index 7041c8923f..7041c8923f 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/XSDefinitionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/XSDefinitionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
index c11d22d7b2..c11d22d7b2 100644
--- a/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
diff --git a/branches/sca-java-1.2.1/modules/interface/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/interface/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/interface/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/interface/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/interface/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/interface/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/interface/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/pom.xml
index 68648b48db..68648b48db 100644
--- a/branches/sca-java-1.2.1/modules/interface/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
index ce00834572..ce00834572 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
index 2503c80f86..2503c80f86 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
index a5e43791a5..a5e43791a5 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
index cce99b4674..cce99b4674 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
index 8176c1cb9c..8176c1cb9c 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
index 568a6c595c..568a6c595c 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
index 54edd3015a..54edd3015a 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
index f952a86478..f952a86478 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
index c4b2dd240d..c4b2dd240d 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
index b19805c5b1..b19805c5b1 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
index d9ff31ba92..d9ff31ba92 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
index 424303a4c7..424303a4c7 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
index 272acb56ed..272acb56ed 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
index c6c97e7036..c6c97e7036 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
index 556a68cf52..556a68cf52 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
index 298de62c08..298de62c08 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
index 3f96b56d31..3f96b56d31 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
index 591758fdb7..591758fdb7 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
index 7706e972c7..7706e972c7 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
index 5efa8ab15f..5efa8ab15f 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
index f835caabef..f835caabef 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
index d715c06101..d715c06101 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
index 06a65a11ad..06a65a11ad 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
index dd4cf863d3..dd4cf863d3 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
index 779186a410..779186a410 100644
--- a/branches/sca-java-1.2.1/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/node-api/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/node-api/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/node-api/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/node-api/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/node-api/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/node-api/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/node-api/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/pom.xml
index 9892dc7ace..9892dc7ace 100644
--- a/branches/sca-java-1.2.1/modules/node-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeException.java
index 5ef2aee114..5ef2aee114 100644
--- a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeException.java
diff --git a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainAccess.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainAccess.java
index bae5a086b0..bae5a086b0 100644
--- a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainAccess.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainAccess.java
diff --git a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainFinder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainFinder.java
index d915a34cd8..d915a34cd8 100644
--- a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainFinder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainFinder.java
diff --git a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
index 676b0f7f8b..676b0f7f8b 100644
--- a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
diff --git a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
index 1cba8a08f4..1cba8a08f4 100644
--- a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
diff --git a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/util/SCAContributionUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/util/SCAContributionUtil.java
index f3b532ed8c..f3b532ed8c 100644
--- a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/util/SCAContributionUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/util/SCAContributionUtil.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/node-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/node-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/node-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/pom.xml
index 71a4d47d23..71a4d47d23 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java
index 396b789794..396b789794 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java
index b00825be45..b00825be45 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainAPIServiceProxyImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainAPIServiceProxyImpl.java
index 1c208e2464..1c208e2464 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainAPIServiceProxyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainAPIServiceProxyImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainEventServiceProxyImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainEventServiceProxyImpl.java
index 42d4be1df4..42d4be1df4 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainEventServiceProxyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainEventServiceProxyImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainFinderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainFinderImpl.java
index f1480d5ded..f1480d5ded 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainFinderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainFinderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
index dcfd186515..dcfd186515 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeFactoryImpl.java
index 5c6d372f11..5c6d372f11 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
index cd5bc37b84..cd5bc37b84 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java
index 0c46050a4c..0c46050a4c 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/launch/SCANodeLauncher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/launch/SCANodeLauncher.java
index 0c12d75a25..0c12d75a25 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/launch/SCANodeLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/launch/SCANodeLauncher.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java
index c19c51f28a..c19c51f28a 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/node.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/node.composite
index 137ae72467..137ae72467 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/node.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/node.composite
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/index.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/index.html
index e53f353b53..e53f353b53 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/index.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/index.html
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/node.png b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/node.png
index fa01e64272..fa01e64272 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/node.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/node.png
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/style.css b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/style.css
index f5bbf23379..f5bbf23379 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/style.css
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/style.css
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddService.java
index d7dc4473ad..d7dc4473ad 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java
index e9b7e254e5..e9b7e254e5 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java
index 5b63ad5a17..5b63ad5a17 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorService.java
index 5fbd3a3f6b..5fbd3a3f6b 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java
index da869e00fd..da869e00fd 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractService.java
index 78ab9c6ee0..78ab9c6ee0 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java
index 1010207154..1010207154 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java
index 0305b4303b..0305b4303b 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java
index 783f61b2c2..783f61b2c2 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java
index ff8987da01..ff8987da01 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java
index eef0374866..eef0374866 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/Calculator.composite
index 538ad2e4c8..538ad2e4c8 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/META-INF/sca-contribution.xml
index 673de80c44..673de80c44 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/Calculator.composite
index c120fed3ca..c120fed3ca 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/META-INF/sca-contribution.xml
index 392310da11..392310da11 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/Calculator.composite
index 534e1a29af..534e1a29af 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml
index db255e0232..db255e0232 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeB/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeB/META-INF/sca-deployables/Calculator.composite
index bdb89803d1..bdb89803d1 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeB/META-INF/sca-deployables/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeB/META-INF/sca-deployables/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeC/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeC/META-INF/sca-deployables/Calculator.composite
index c5af8dd3cc..c5af8dd3cc 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeC/META-INF/sca-deployables/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeC/META-INF/sca-deployables/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeD/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeD/META-INF/sca-deployables/Calculator.composite
index 119c52cbf8..119c52cbf8 100644
--- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeD/META-INF/sca-deployables/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeD/META-INF/sca-deployables/Calculator.composite
diff --git a/branches/sca-java-1.2.1/modules/node/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/node/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/node/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/node/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/node/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/node/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/node/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/pom.xml
index 9be59d662d..9be59d662d 100644
--- a/branches/sca-java-1.2.1/modules/node/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java
index b3a856c276..b3a856c276 100644
--- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java
diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java
index ac51add4d7..ac51add4d7 100644
--- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java
diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java
index 6a22c3c8f4..6a22c3c8f4 100644
--- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java
diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java
index afb4e0c3ed..afb4e0c3ed 100644
--- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java
diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
index c4a83fd624..c4a83fd624 100644
--- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java
index ea20afaf71..ea20afaf71 100644
--- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java
index 96ff3a0c1a..96ff3a0c1a 100644
--- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java
diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java
index 37414486e0..37414486e0 100644
--- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java
diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerInitService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerInitService.java
index d63a6e1159..d63a6e1159 100644
--- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerInitService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerInitService.java
diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java
index 093dda4aec..093dda4aec 100644
--- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java
diff --git a/branches/sca-java-1.2.1/modules/node2-api/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/node2-api/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/node2-api/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/node2-api/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/node2-api/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/node2-api/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/node2-api/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/pom.xml
index 92632f767e..92632f767e 100644
--- a/branches/sca-java-1.2.1/modules/node2-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java
index 8ddafcf8d9..8ddafcf8d9 100644
--- a/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java
diff --git a/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java
index 4fd3e35668..4fd3e35668 100644
--- a/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java
diff --git a/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java
index e956993dbc..e956993dbc 100644
--- a/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java
diff --git a/branches/sca-java-1.2.1/modules/node2-impl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/DISCLAIMER
index 8e5c524323..8e5c524323 100644
--- a/branches/sca-java-1.2.1/modules/node2-impl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/node2-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/node2-impl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/node2-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/node2-impl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/node2-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/pom.xml
index 6a2ce22156..6a2ce22156 100644
--- a/branches/sca-java-1.2.1/modules/node2-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
index c1cb1d9612..c1cb1d9612 100644
--- a/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
index 0bb9e18a54..0bb9e18a54 100644
--- a/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/pom.xml
index 44d0b59e6b..44d0b59e6b 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 78bbebbb83..78bbebbb83 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml
index 6c2c943c99..6c2c943c99 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/index.jsp b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/index.jsp
index a739302ce6..a739302ce6 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/index.jsp
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/index.jsp
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/pom.xml
index 0fdfa51645..0fdfa51645 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
index f661f9019d..f661f9019d 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
index 39e8d81139..39e8d81139 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
index be416ec68b..be416ec68b 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
index d8124037fe..d8124037fe 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
index 6abd571b31..6abd571b31 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
index eafe4ddaa0..eafe4ddaa0 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
index 63515b9cd1..63515b9cd1 100644
--- a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/LICENSE
index 6b0b1270ff..6b0b1270ff 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/pom.xml
index e1987fb877..e1987fb877 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java
index 2764e72771..2764e72771 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java
index a5f02c7b31..a5f02c7b31 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java
index 9c3373ea8a..9c3373ea8a 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java
index 5edf6fe130..5edf6fe130 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java
index 7bffa9284e..7bffa9284e 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java
index 1dbe75f431..1dbe75f431 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 88b8f1e021..88b8f1e021 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/osgi-runtime/src/test/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/test/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeTestCase.java
index 8bc77b5bb6..8bc77b5bb6 100644
--- a/branches/sca-java-1.2.1/modules/osgi-runtime/src/test/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/osgi-runtime/src/test/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/pom.xml
index 5d05bc57c9..5d05bc57c9 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
index 828792179e..828792179e 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
index 7d89ad7869..7d89ad7869 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
index d2400b149b..d2400b149b 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
index f10eba75ad..f10eba75ad 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
index 33e33bc680..33e33bc680 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
index 9bbae8956f..9bbae8956f 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
index feddc8c056..feddc8c056 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
index 472f76c680..472f76c680 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index f56f96e4b9..f56f96e4b9 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
index ec40cb7dc5..ec40cb7dc5 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index e14c657d80..e14c657d80 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
index 68615a4356..68615a4356 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
index ca96c8abd3..ca96c8abd3 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
index 1589d6daf9..1589d6daf9 100644
--- a/branches/sca-java-1.2.1/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/pom.xml
index 53f529bb11..53f529bb11 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
index 69dee983ec..69dee983ec 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyHandler.java
index 33835787f5..33835787f5 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyHandler.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
index c70f3ce0d2..c70f3ce0d2 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProviderFactory.java
index 2faf7bef14..2faf7bef14 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/WSSecurityPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/WSSecurityPolicyHandler.java
index 0493a900af..0493a900af 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/WSSecurityPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/WSSecurityPolicyHandler.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 71783b1306..71783b1306 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
index 790424df6b..790424df6b 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index 5bae401538..5bae401538 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index 352d6c693e..352d6c693e 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java
index 037edd9718..037edd9718 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
index 77f750cd0d..77f750cd0d 100644
--- a/branches/sca-java-1.2.1/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-security/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/policy-security/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/policy-security/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/policy-security/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/pom.xml
index b4cd2ca87c..b4cd2ca87c 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
index e6e5d02559..e6e5d02559 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
index c25c49976b..c25c49976b 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
index 328c290fad..328c290fad 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
index efe8178605..efe8178605 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
index adac7721c4..adac7721c4 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
index ee66eb4437..ee66eb4437 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
index 48a42eb711..48a42eb711 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index e3d4ce6be1..e3d4ce6be1 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
index 790424df6b..790424df6b 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index 0fa98020f9..0fa98020f9 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
index 19129615f5..19129615f5 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
index 77f750cd0d..77f750cd0d 100644
--- a/branches/sca-java-1.2.1/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/pom.xml
index 048ff408a7..048ff408a7 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
index 8a242924ee..8a242924ee 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
index 3c11fef865..3c11fef865 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
index ab142bfc1c..ab142bfc1c 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
index 0de98592cb..0de98592cb 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
index defe12967e..defe12967e 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
index 31beab4fca..31beab4fca 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
index a5bc4c5492..a5bc4c5492 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
index a13748f232..a13748f232 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
index 6cee454177..6cee454177 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
index f178876a72..f178876a72 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
index 27cfbea2b2..27cfbea2b2 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
index b5ac365b2c..b5ac365b2c 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
index 0795a4e5cf..0795a4e5cf 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
index 9f9088a380..9f9088a380 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
index 5a7ae5c4cc..5a7ae5c4cc 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 1d034e23a2..1d034e23a2 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 9a35d62cad..9a35d62cad 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
index e9d9fab519..e9d9fab519 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index eeec814f60..eeec814f60 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/log4j.properties
index 698ee41d7e..698ee41d7e 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/log4j.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/log4j.properties
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
index ff51b131b7..ff51b131b7 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
index 324fa03da6..324fa03da6 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
index 41b7eb7377..41b7eb7377 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
index 544e0f68c0..544e0f68c0 100644
--- a/branches/sca-java-1.2.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml-ws/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/DISCLAIMER
index 8e5c524323..8e5c524323 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml-ws/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/policy-xml-ws/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml-ws/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/policy-xml-ws/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml-ws/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/policy-xml-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/pom.xml
index 8e8828aa62..8e8828aa62 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessor.java
index c6d4cf8aec..c6d4cf8aec 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 29e9ac3ff3..29e9ac3ff3 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
index 7cfbfe29b3..7cfbfe29b3 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
index b887257efe..b887257efe 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java
index 7f1f88ee41..7f1f88ee41 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index 814476b4f9..814476b4f9 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/pom.xml
index 2b9cbd9b18..2b9cbd9b18 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
index 068edd1733..068edd1733 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
index 94b8b9faf1..94b8b9faf1 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
index 40190b2e2f..40190b2e2f 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
index 1a830f3b19..1a830f3b19 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
index 3998ab58be..3998ab58be 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
index cdd247b1a8..cdd247b1a8 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
index 5aafa74a9b..5aafa74a9b 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
index b453681cef..b453681cef 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
index 993014cb03..993014cb03 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 0741e3eb76..0741e3eb76 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
index 7cfbfe29b3..7cfbfe29b3 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
index b4a06a23e2..b4a06a23e2 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
index 1c7d407aaf..1c7d407aaf 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
diff --git a/branches/sca-java-1.2.1/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index 3728e8f2b4..3728e8f2b4 100644
--- a/branches/sca-java-1.2.1/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
diff --git a/branches/sca-java-1.2.1/modules/policy/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/policy/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/policy/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/policy/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/policy/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/NOTICE
index b3e4797aaa..b3e4797aaa 100644
--- a/branches/sca-java-1.2.1/modules/policy/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/policy/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/pom.xml
index 584742c257..584742c257 100644
--- a/branches/sca-java-1.2.1/modules/policy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
index e64abccedc..e64abccedc 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
index 2da41675a1..2da41675a1 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
index a9b9ac4884..a9b9ac4884 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
index 8a8342ed04..8a8342ed04 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
index ad8aa4845e..ad8aa4845e 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
index c0dc78e742..c0dc78e742 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
index 9dd0be314b..9dd0be314b 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
index 3d34f24e45..3d34f24e45 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
index c7c5192a61..c7c5192a61 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
index c0f2087ca6..c0f2087ca6 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
index 37d9553378..37d9553378 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
index 8d8657da95..8d8657da95 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
index f2d3f25b66..f2d3f25b66 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
index 95604be25a..95604be25a 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
index 2aba59b37f..2aba59b37f 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
index fea1c0bf1c..fea1c0bf1c 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
index ee63086e14..ee63086e14 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
index 4a86174a00..4a86174a00 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
index 757e4bcfc7..757e4bcfc7 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
index aab03281ba..aab03281ba 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
index 467ad16e2c..467ad16e2c 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
index 1db29b835e..1db29b835e 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
index 4bd9d5b7c7..4bd9d5b7c7 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
index 8dce444879..8dce444879 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
index 014cd725d8..014cd725d8 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
index 321cfee621..321cfee621 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
index 0160a6f3b0..0160a6f3b0 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
index c5d1c8d44a..c5d1c8d44a 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
index cc61805671..cc61805671 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
index 60d43ec92e..60d43ec92e 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
index e9782c4927..e9782c4927 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
index 35c1d3637a..35c1d3637a 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
index d98ba8394e..d98ba8394e 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
index a0e56c1822..a0e56c1822 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
diff --git a/branches/sca-java-1.2.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
index 846b3b24a4..846b3b24a4 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
diff --git a/branches/sca-java-1.2.1/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
index d7f87b1c5d..d7f87b1c5d 100644
--- a/branches/sca-java-1.2.1/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/pom.xml
index 7f3f50fb1a..7f3f50fb1a 100644
--- a/branches/sca-java-1.2.1/modules/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/runtime-standalone/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/runtime-standalone/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/runtime-standalone/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/runtime-standalone/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/runtime-standalone/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/runtime-standalone/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/runtime-standalone/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/pom.xml
index bd6b1a847d..bd6b1a847d 100644
--- a/branches/sca-java-1.2.1/modules/runtime-standalone/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/runtime-standalone/src/main/java/org/apache/tuscany/sca/runtime/standalone/StandaloneLauncher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/src/main/java/org/apache/tuscany/sca/runtime/standalone/StandaloneLauncher.java
index ae05f0bd29..ae05f0bd29 100644
--- a/branches/sca-java-1.2.1/modules/runtime-standalone/src/main/java/org/apache/tuscany/sca/runtime/standalone/StandaloneLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/src/main/java/org/apache/tuscany/sca/runtime/standalone/StandaloneLauncher.java
diff --git a/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/java/org/apache/tuscany/sca/runtime/standalone/LauncherTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/java/org/apache/tuscany/sca/runtime/standalone/LauncherTestCase.java
index d29d4a3851..d29d4a3851 100644
--- a/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/java/org/apache/tuscany/sca/runtime/standalone/LauncherTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/java/org/apache/tuscany/sca/runtime/standalone/LauncherTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/resources/repo/bla/helloworld-ws-js.jar b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/resources/repo/bla/helloworld-ws-js.jar
index 6978bee727..6978bee727 100644
--- a/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/resources/repo/bla/helloworld-ws-js.jar
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/resources/repo/bla/helloworld-ws-js.jar
diff --git a/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/resources/repo/tuscany.properties b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/resources/repo/tuscany.properties
index a0d83168f7..a0d83168f7 100644
--- a/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/resources/repo/tuscany.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-standalone/src/test/resources/repo/tuscany.properties
diff --git a/branches/sca-java-1.2.1/modules/runtime-tomcat/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/runtime-tomcat/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/runtime-tomcat/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/runtime-tomcat/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/runtime-tomcat/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/runtime-tomcat/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/runtime-tomcat/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/pom.xml
index 62655b668e..62655b668e 100644
--- a/branches/sca-java-1.2.1/modules/runtime-tomcat/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java
index 769ac4912d..769ac4912d 100644
--- a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java
diff --git a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
index e4398b95fe..e4398b95fe 100644
--- a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
diff --git a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java
index a3e3f8f15e..a3e3f8f15e 100644
--- a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java
diff --git a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java
index 90d55af0bb..90d55af0bb 100644
--- a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java
diff --git a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java
index 5a409a6a6c..5a409a6a6c 100644
--- a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java
diff --git a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/branches/sca-java-1.2.1/modules/runtime-tomcat/src/test/resources/content/test.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-tomcat/src/test/resources/content/test.html
diff --git a/branches/sca-java-1.2.1/modules/runtime-war/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-war/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/runtime-war/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-war/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/runtime-war/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-war/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/runtime-war/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-war/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/runtime-war/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-war/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/runtime-war/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-war/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/runtime-war/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-war/pom.xml
index 4fe3eaff9b..4fe3eaff9b 100644
--- a/branches/sca-java-1.2.1/modules/runtime-war/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime-war/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/runtime/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/runtime/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/pom.xml
index b02c389022..b02c389022 100644
--- a/branches/sca-java-1.2.1/modules/runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java
index fd0dfe56cd..fd0dfe56cd 100644
--- a/branches/sca-java-1.2.1/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/sca-api/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/sca-api/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/sca-api/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/pom.xml
index 228c9e04ba..228c9e04ba 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
index c32d229a76..c32d229a76 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
index 616d4c6338..616d4c6338 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/Constants.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
index b1b2af8048..b1b2af8048 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
index 64423a4aa2..64423a4aa2 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
index 63e3907cff..63e3907cff 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
index 7c067a3a43..7c067a3a43 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
index 900d5eecc1..900d5eecc1 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
index 8790aac4fb..8790aac4fb 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
index 1c6b436afa..1c6b436afa 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
index d3543799ed..d3543799ed 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
index bab9713026..bab9713026 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
index 1d1ecdbc13..1d1ecdbc13 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
index a9fc36f769..a9fc36f769 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
index 477053670a..477053670a 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
index f54e421c81..f54e421c81 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
index 86d2d6560d..86d2d6560d 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
index 37f767c1f4..37f767c1f4 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
index 51d5ae76ca..51d5ae76ca 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
index 13ca9a2931..13ca9a2931 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
index f16bf44808..f16bf44808 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
index 7d3da46ea9..7d3da46ea9 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
index b9483bc9a8..b9483bc9a8 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
index 9e6942651b..9e6942651b 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
index 32654fea17..32654fea17 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
index 1a9288934c..1a9288934c 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
index 0769a94fbb..0769a94fbb 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
index fbc7398da4..fbc7398da4 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
index 57247cd8a3..57247cd8a3 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
index 864a69b19a..864a69b19a 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
index a0abe16068..a0abe16068 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
index e07f70c2fe..e07f70c2fe 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
index 1021f6e37f..1021f6e37f 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
index aa439cabab..aa439cabab 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
index 6fded2dec8..6fded2dec8 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
diff --git a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
index 1e475cd4c8..1e475cd4c8 100644
--- a/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/pom.xml
index 13c972156e..13c972156e 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeImageCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeImageCollectionImpl.java
index 787b7aca08..787b7aca08 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeImageCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeImageCollectionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionCollectionImpl.java
index 6b8541b279..6b8541b279 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionCollectionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java
index 2aeeb14727..2aeeb14727 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java
index fe5a3fe7e1..fe5a3fe7e1 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DomainAdminUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DomainAdminUtil.java
index 39fec24e92..39fec24e92 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DomainAdminUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DomainAdminUtil.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileCollectionImpl.java
index 241dc6f55b..241dc6f55b 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileCollectionImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileCollectionImpl.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileServiceImpl.java
index fe0fc9e415..fe0fc9e415 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/NodeProcessCollectionFacadeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/NodeProcessCollectionFacadeImpl.java
index 251f6cd410..251f6cd410 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/NodeProcessCollectionFacadeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/NodeProcessCollectionFacadeImpl.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/QuickStartServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/QuickStartServiceImpl.java
index 550f97c2ad..550f97c2ad 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/QuickStartServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/QuickStartServiceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/launcher/DomainManagerLauncherBootstrap.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/launcher/DomainManagerLauncherBootstrap.java
index 7b23951aef..7b23951aef 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/launcher/DomainManagerLauncherBootstrap.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/launcher/DomainManagerLauncherBootstrap.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/DomainManager.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/DomainManager.composite
index 3f793405b1..3f793405b1 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/DomainManager.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/DomainManager.composite
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/admin.css b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/admin.css
index aa6e910f85..aa6e910f85 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/admin.css
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/admin.css
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/cloud.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/cloud.html
index 193e30bb49..193e30bb49 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/cloud.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/cloud.html
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/composite.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/composite.html
index 96cf59c7c2..96cf59c7c2 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/composite.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/composite.html
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/files.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/files.html
index d29b913bf5..d29b913bf5 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/files.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/files.html
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/home.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/home.html
index 02b70e688e..02b70e688e 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/home.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/home.html
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/icons/feed-icon.png b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/icons/feed-icon.png
index a59728b2ad..a59728b2ad 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/icons/feed-icon.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/icons/feed-icon.png
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/utils.js b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/utils.js
index 853ce5d235..853ce5d235 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/utils.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/utils.js
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/workspace.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/workspace.html
index fb00b4c8c1..fb00b4c8c1 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/workspace.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/workspace.html
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java
index 9fea3445b3..9fea3445b3 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/assets/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
index e03da2431b..e03da2431b 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/store/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/store/META-INF/sca-contribution.xml
index 48d4be2d6e..48d4be2d6e 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/store/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/store/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/workspace.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/workspace.xml
index e6ac7d7701..e6ac7d7701 100644
--- a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/workspace.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/workspace.xml
diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/workspace-impl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/workspace-impl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/workspace-impl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/pom.xml
index f2ee87978b..f2ee87978b 100644
--- a/branches/sca-java-1.2.1/modules/workspace-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
index 9d96b7783d..9d96b7783d 100644
--- a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
index 3e715e83a8..3e715e83a8 100644
--- a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
index 14686753b0..14686753b0 100644
--- a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java
index 45ba8c0609..45ba8c0609 100644
--- a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java
index 9dd1b3a15b..9dd1b3a15b 100644
--- a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
index 55dfdbe10f..55dfdbe10f 100644
--- a/branches/sca-java-1.2.1/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/workspace-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/workspace-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/workspace-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/workspace-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/workspace-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/workspace-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/pom.xml
index 6c188a7ae7..6c188a7ae7 100644
--- a/branches/sca-java-1.2.1/modules/workspace-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
index 16157396c7..16157396c7 100644
--- a/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
index 2737814cfe..2737814cfe 100644
--- a/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
diff --git a/branches/sca-java-1.2.1/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionWorkspaceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionWorkspaceProcessorTestCase.java
index c09600f5a6..c09600f5a6 100644
--- a/branches/sca-java-1.2.1/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionWorkspaceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionWorkspaceProcessorTestCase.java
diff --git a/branches/sca-java-1.2.1/modules/workspace/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/modules/workspace/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/modules/workspace/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/modules/workspace/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/LICENSE
diff --git a/branches/sca-java-1.2.1/modules/workspace/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/modules/workspace/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/NOTICE
diff --git a/branches/sca-java-1.2.1/modules/workspace/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/pom.xml
index 3bf91e1466..3bf91e1466 100644
--- a/branches/sca-java-1.2.1/modules/workspace/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/pom.xml
diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
index e895669d23..e895669d23 100644
--- a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
index 6146ccdae2..6146ccdae2 100644
--- a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
index 2656068bea..2656068bea 100644
--- a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java
index f3a7aa22c1..f3a7aa22c1 100644
--- a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java
diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilderMonitor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilderMonitor.java
index 939733ee34..939733ee34 100644
--- a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilderMonitor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilderMonitor.java
diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
index e41cc3ea83..e41cc3ea83 100644
--- a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
index 649faafafa..649faafafa 100644
--- a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory
index d390d29d90..d390d29d90 100644
--- a/branches/sca-java-1.2.1/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory
diff --git a/branches/sca-java-1.2.1/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/pom.xml
index 50f9ba4d85..50f9ba4d85 100644
--- a/branches/sca-java-1.2.1/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/README
index e4c2bcf7fb..e4c2bcf7fb 100644
--- a/branches/sca-java-1.2.1/samples/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/README
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/README
index 94716b151f..94716b151f 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/README
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/build.xml
index 5df5981bea..5df5981bea 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/build.xml
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/pom.xml
index 0c55e732f2..0c55e732f2 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
index 3fe1598e0d..3fe1598e0d 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
index 0f6fee82be..0f6fee82be 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
index af759dbf93..af759dbf93 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
index 19c9271bb8..19c9271bb8 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
index 7eaa7e4fb5..7eaa7e4fb5 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
index 91697fcd9a..91697fcd9a 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
index 83b51bcbeb..83b51bcbeb 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
index ba74d8f99a..ba74d8f99a 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
index 0efc319af9..0efc319af9 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
index 1cd1e5af4e..1cd1e5af4e 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
index 24376176bf..24376176bf 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
index c6a6d3a4dd..c6a6d3a4dd 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
index ba05c3458c..ba05c3458c 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
index 4b06630102..4b06630102 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
index 21defcd3ee..21defcd3ee 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
index 9ce8cb4f9b..9ce8cb4f9b 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
index 7df7b2c147..7df7b2c147 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
index 4f7c13c735..4f7c13c735 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
index fb13a36199..fb13a36199 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
index 447917f010..447917f010 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
index 8ea2395d04..8ea2395d04 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
index 32336dd94f..32336dd94f 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
index 55be293862..55be293862 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 06d53250c1..06d53250c1 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 4ad61f573d..4ad61f573d 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index efa475ef92..efa475ef92 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
index 9b64df4871..9b64df4871 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/Echo.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/Echo.java
index 1d5e973f33..1d5e973f33 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/Echo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/Echo.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
index ba68dfe908..ba68dfe908 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
index 7383077f18..7383077f18 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
index ab05516622..ab05516622 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/resources/EchoBinding.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
index 176d67cc4b..176d67cc4b 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
diff --git a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/resources/definitions.xml
index d3c7639a92..d3c7639a92 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo-extension/src/test/resources/definitions.xml
diff --git a/branches/sca-java-1.2.1/samples/binding-echo/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/README
index 2772460cc6..2772460cc6 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/README
diff --git a/branches/sca-java-1.2.1/samples/binding-echo/binding-echo.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/binding-echo.png
index a38d985363..a38d985363 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo/binding-echo.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/binding-echo.png
diff --git a/branches/sca-java-1.2.1/samples/binding-echo/binding-echo.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/binding-echo.svg
index 5b5051bef5..5b5051bef5 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo/binding-echo.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/binding-echo.svg
diff --git a/branches/sca-java-1.2.1/samples/binding-echo/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/build.xml
index 7689ef3a54..7689ef3a54 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/build.xml
diff --git a/branches/sca-java-1.2.1/samples/binding-echo/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/pom.xml
index cc89785362..cc89785362 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/Echo.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/Echo.java
index 1d5e973f33..1d5e973f33 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/Echo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/Echo.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/EchoBindingClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
index 21bdff4011..21bdff4011 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
index ba68dfe908..ba68dfe908 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/binding-echo/src/main/resources/EchoBinding.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/src/main/resources/EchoBinding.composite
index 94612fb325..94612fb325 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo/src/main/resources/EchoBinding.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/src/main/resources/EchoBinding.composite
diff --git a/branches/sca-java-1.2.1/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
index 1a597fc80f..1a597fc80f 100644
--- a/branches/sca-java-1.2.1/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/README
index aadb94063f..aadb94063f 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/README
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/binding-notification-broker.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/binding-notification-broker.png
index 49030650f2..49030650f2 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/binding-notification-broker.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/binding-notification-broker.png
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/build.xml
index f24acb008b..f24acb008b 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/build.xml
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/pom.xml
index 6a7e8022f5..6a7e8022f5 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
index b5926c520f..b5926c520f 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
index 49ce48406c..49ce48406c 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
index ac20ba4969..ac20ba4969 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
index c913fd90be..c913fd90be 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
index 93730acf0b..93730acf0b 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
index 2dc70f8ed1..2dc70f8ed1 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
index f490c34ea6..f490c34ea6 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
index b823bbebcc..b823bbebcc 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-consumer/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/README
index bcf999dead..bcf999dead 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-consumer/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/README
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-consumer/binding-notification-consumer.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/binding-notification-consumer.png
index 33e1966c3e..33e1966c3e 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-consumer/binding-notification-consumer.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/binding-notification-consumer.png
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-consumer/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/build.xml
index 8b8cc74c84..8b8cc74c84 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-consumer/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/build.xml
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-consumer/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/pom.xml
index b2eb6d6194..b2eb6d6194 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-consumer/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
index 90025332c5..90025332c5 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
index 0c89e4e5b2..0c89e4e5b2 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
index 26a96b21da..26a96b21da 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
index 2dc70f8ed1..2dc70f8ed1 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
index 8f9bcc4438..8f9bcc4438 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
index b823bbebcc..b823bbebcc 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
index ebb1580b15..ebb1580b15 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/README
index 3e6f0a5d99..3e6f0a5d99 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/README
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/binding-notification-producer.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/binding-notification-producer.png
index 34c347c893..34c347c893 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/binding-notification-producer.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/binding-notification-producer.png
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/build.xml
index 3814f3ac63..3814f3ac63 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/build.xml
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/pom.xml
index d8fc075d34..d8fc075d34 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
index 19684d2fb0..19684d2fb0 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
index ea649b5818..ea649b5818 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
index 65711af2c1..65711af2c1 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
index 99decf273b..99decf273b 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
index 2dc70f8ed1..2dc70f8ed1 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
index 2db6ea655b..2db6ea655b 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
index b823bbebcc..b823bbebcc 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
diff --git a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
index 1b909601e4..1b909601e4 100644
--- a/branches/sca-java-1.2.1/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/README
index 065401e424..065401e424 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/README
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/build.xml
index 8fcec13a05..8fcec13a05 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/build.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/calculator-distributed.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/calculator-distributed.png
index 7c0e175664..7c0e175664 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/calculator-distributed.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/calculator-distributed.png
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/calculator-distributed.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/calculator-distributed.svg
index be5a4b8185..be5a4b8185 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/calculator-distributed.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/calculator-distributed.svg
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/cloud.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/cloud.composite
index 85e2f9c7f3..85e2f9c7f3 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/cloud.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/cloud.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/domain.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/domain.composite
index 643e22d0cf..643e22d0cf 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/domain.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/domain.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/pom.xml
index db30a3b1b6..db30a3b1b6 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/AddService.java
index d7dc4473ad..d7dc4473ad 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
index e9b7e254e5..e9b7e254e5 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
index da869e00fd..da869e00fd 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
index 78ab9c6ee0..78ab9c6ee0 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
index 1010207154..1010207154 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
index 1a4860d52d..1a4860d52d 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
index f9bdde79e1..f9bdde79e1 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
index 74849fe50b..74849fe50b 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchDomain.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
index dd19f6b49b..dd19f6b49b 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
index ed7fe55abc..ed7fe55abc 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
index 8f29cc17aa..8f29cc17aa 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
index 9ad132b0d4..9ad132b0d4 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
index 172676a3c7..172676a3c7 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
index db255e0232..db255e0232 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
index b770dbe8d4..b770dbe8d4 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 130157ac04..130157ac04 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
index 66caf0d17b..66caf0d17b 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
index cba0a5c281..cba0a5c281 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
index 1f0fc9227a..1f0fc9227a 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-distributed/workspace.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/workspace.xml
index 7d6d3dbdbd..7d6d3dbdbd 100644
--- a/branches/sca-java-1.2.1/samples/calculator-distributed/workspace.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-distributed/workspace.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/README
index b69c6873a6..b69c6873a6 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/README
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/build.xml
index 3d65356a06..3d65356a06 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/build.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/calculator.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/calculator.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/calculator.png
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/calculator.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/calculator.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/calculator.svg
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/pom.xml
index 1ebe9a82d2..1ebe9a82d2 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
index 57bbc39d89..57bbc39d89 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
index 4f063993a3..4f063993a3 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
index b3ef6e7312..b3ef6e7312 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
index 595626e672..595626e672 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
index d91bf88d96..d91bf88d96 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
index c3adb904b2..c3adb904b2 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
index 0238f0b013..0238f0b013 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/definitions.xml
index b9f0feb145..b9f0feb145 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
index d44e86775b..d44e86775b 100644
--- a/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/README
index 837b5ce75f..837b5ce75f 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/README
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/build.xml
index 5f491a0da9..5f491a0da9 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/build.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/calculator-rmi-reference.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/calculator-rmi-reference.png
index 8c76b77a9f..8c76b77a9f 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/calculator-rmi-reference.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/calculator-rmi-reference.png
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/calculator-rmi-reference.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/calculator-rmi-reference.svg
index ba802e6717..ba802e6717 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/calculator-rmi-reference.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/calculator-rmi-reference.svg
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/pom.xml
index 6ddf3ac8be..6ddf3ac8be 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
index 3e0577341c..3e0577341c 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
index 5ca8b6ec99..5ca8b6ec99 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
index d40614ad19..d40614ad19 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
index a5a6e1cd29..a5a6e1cd29 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 2f5a050583..2f5a050583 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/README
index 454cdc0d37..454cdc0d37 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/README
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/build.xml
index f98f35e4b0..f98f35e4b0 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/build.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/calculator-rmi-service.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/calculator-rmi-service.png
index 574f5eb14b..574f5eb14b 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/calculator-rmi-service.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/calculator-rmi-service.png
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/calculator-rmi-service.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/calculator-rmi-service.svg
index 9253110f98..9253110f98 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/calculator-rmi-service.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/calculator-rmi-service.svg
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/pom.xml
index e04cd65960..e04cd65960 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
index 4e42d2046d..4e42d2046d 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
index 1b4db529c3..1b4db529c3 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
index d40614ad19..d40614ad19 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
index 34d90ab451..34d90ab451 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
index 3582eada70..3582eada70 100644
--- a/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/README
index ab1dda13df..ab1dda13df 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/README
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/build.xml
index 429d638ca5..429d638ca5 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/build.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/calculator-script.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/calculator-script.png
index d3f8c491c3..d3f8c491c3 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/calculator-script.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/calculator-script.png
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/calculator-script.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/calculator-script.svg
index 16939f9310..16939f9310 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/calculator-script.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/calculator-script.svg
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/pom.xml
index d01c52b3da..d01c52b3da 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
index 243d1562dc..243d1562dc 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/Calculator.composite
index 8a765e6153..8a765e6153 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
index 1d4d221364..1d4d221364 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
index d6f27ca7f5..d6f27ca7f5 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
index d31c020de0..d31c020de0 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/branches/sca-java-1.2.1/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
index fea8f62110..fea8f62110 100644
--- a/branches/sca-java-1.2.1/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/README
index c88b92b206..c88b92b206 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/calculator-web.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/calculator-web.png
index 896ddc4093..896ddc4093 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/calculator-web.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/calculator-web.png
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/calculator-web.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/calculator-web.svg
index 00ed27556f..00ed27556f 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/calculator-web.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/calculator-web.svg
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/pom.xml
index 9e84fbce9c..9e84fbce9c 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
index ac76137fcb..ac76137fcb 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/resources/Calculator.composite
index 50c23af0b2..50c23af0b2 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/resources/wsdl/add.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/resources/wsdl/add.wsdl
index 6c642e932c..6c642e932c 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/resources/wsdl/add.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/resources/wsdl/add.wsdl
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 3ce1f21836..3ce1f21836 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
index 701ba48203..701ba48203 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/calc.jsp
index ad1b8aa07e..ad1b8aa07e 100644
--- a/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/README
index 690152ff65..690152ff65 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/calculator-web.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/calculator-web.png
index f482b8d1c8..f482b8d1c8 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/calculator-web.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/calculator-web.png
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/calculator-web.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/calculator-web.svg
index 1b7015b156..1b7015b156 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/calculator-web.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/calculator-web.svg
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/pom.xml
index 647c40243b..647c40243b 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
index 1550799832..1550799832 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
index 7e9a8c2909..7e9a8c2909 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
index ac76137fcb..ac76137fcb 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
index 34457699e2..34457699e2 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
index 72fb6a50a9..72fb6a50a9 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
index 2b3ecad284..2b3ecad284 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
index 4d511f887e..4d511f887e 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
index b6b244244b..b6b244244b 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
index 136f85fe00..136f85fe00 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/security.properties b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
index 20d7b3a136..20d7b3a136 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 3ce1f21836..3ce1f21836 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 4c4b07bf5f..4c4b07bf5f 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
index 701ba48203..701ba48203 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
index ad1b8aa07e..ad1b8aa07e 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/README
index 690152ff65..690152ff65 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/calculator-web.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/calculator-web.png
index f482b8d1c8..f482b8d1c8 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/calculator-web.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/calculator-web.png
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/calculator-web.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/calculator-web.svg
index 1b7015b156..1b7015b156 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/calculator-web.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/calculator-web.svg
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/pom.xml
index 9aa7abaf47..9aa7abaf47 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
index 1550799832..1550799832 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
index ece31fd459..ece31fd459 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
index ac76137fcb..ac76137fcb 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
index 6415d5a896..6415d5a896 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 3ce1f21836..3ce1f21836 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index dd06198372..dd06198372 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
index 701ba48203..701ba48203 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
index ad1b8aa07e..ad1b8aa07e 100644
--- a/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-java-1.2.1/samples/calculator/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/README
index ceb532faed..ceb532faed 100644
--- a/branches/sca-java-1.2.1/samples/calculator/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/README
diff --git a/branches/sca-java-1.2.1/samples/calculator/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/build.xml
index c4b755ef94..c4b755ef94 100644
--- a/branches/sca-java-1.2.1/samples/calculator/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/build.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator/calculator.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-java-1.2.1/samples/calculator/calculator.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/calculator.png
diff --git a/branches/sca-java-1.2.1/samples/calculator/calculator.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/calculator.svg
index 0615925c50..0615925c50 100644
--- a/branches/sca-java-1.2.1/samples/calculator/calculator.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/calculator.svg
diff --git a/branches/sca-java-1.2.1/samples/calculator/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/pom.xml
index 556799c908..556799c908 100644
--- a/branches/sca-java-1.2.1/samples/calculator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorClient.java
index 9d180bf52e..9d180bf52e 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/resources/Calculator.composite
index 90872041b0..90872041b0 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.2.1/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
index 775ad15537..775ad15537 100644
--- a/branches/sca-java-1.2.1/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/README
index c32e25e7fc..c32e25e7fc 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/README
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/build.xml
index 757525bd1d..757525bd1d 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/build.xml
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/callback-ws-client.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/callback-ws-client.png
index 802ef604a7..802ef604a7 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/callback-ws-client.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/callback-ws-client.png
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/callback-ws-client.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/callback-ws-client.svg
index f49aeadbbf..f49aeadbbf 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/callback-ws-client.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/callback-ws-client.svg
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/pom.xml
index 025e3cd61d..025e3cd61d 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myapp/MyClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myapp/MyClient.java
index 199b964f10..199b964f10 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myapp/MyClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myapp/MyClient.java
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
index 856bbda111..856bbda111 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myserver/MyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myserver/MyService.java
index 7c1c14f574..7c1c14f574 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myserver/MyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myserver/MyService.java
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
index 532d1b0497..532d1b0497 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
index b44a6a5368..b44a6a5368 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/resources/myapp.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/resources/myapp.composite
index 7c0dd1f5dc..7c0dd1f5dc 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/resources/myapp.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/main/resources/myapp.composite
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
index a69819bfd5..a69819bfd5 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/README
index cc7454083e..cc7454083e 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/README
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/build.xml
index ffbaf16f06..ffbaf16f06 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/build.xml
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/callback-ws-service.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/callback-ws-service.png
index 772ac38431..772ac38431 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/callback-ws-service.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/callback-ws-service.png
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/callback-ws-service.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/callback-ws-service.svg
index ff0a1d307b..ff0a1d307b 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/callback-ws-service.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/callback-ws-service.svg
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/pom.xml
index 372998e494..372998e494 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
index d4abc2f597..d4abc2f597 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyService.java
index 7c1c14f574..7c1c14f574 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyService.java
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
index 532d1b0497..532d1b0497 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
index f36ea43a97..f36ea43a97 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
index 7c0f6d9315..7c0f6d9315 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/resources/callbackws.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/resources/callbackws.composite
index 4cfadccfd3..4cfadccfd3 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/resources/callbackws.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/main/resources/callbackws.composite
diff --git a/branches/sca-java-1.2.1/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
index 57ea5b0229..57ea5b0229 100644
--- a/branches/sca-java-1.2.1/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/chat-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/README
index 0186006211..0186006211 100644
--- a/branches/sca-java-1.2.1/samples/chat-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/chat-webapp/chat-webapp.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/chat-webapp.png
index fdf540d243..fdf540d243 100644
--- a/branches/sca-java-1.2.1/samples/chat-webapp/chat-webapp.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/chat-webapp.png
diff --git a/branches/sca-java-1.2.1/samples/chat-webapp/chat-webapp.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/chat-webapp.svg
index b37c1dc590..b37c1dc590 100644
--- a/branches/sca-java-1.2.1/samples/chat-webapp/chat-webapp.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/chat-webapp.svg
diff --git a/branches/sca-java-1.2.1/samples/chat-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/pom.xml
index 49b4591391..49b4591391 100644
--- a/branches/sca-java-1.2.1/samples/chat-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/java/sample/ChatService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/java/sample/ChatService.java
index fbec33faa6..fbec33faa6 100644
--- a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/java/sample/ChatService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/java/sample/ChatService.java
diff --git a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
index 7d0bfb3307..7d0bfb3307 100644
--- a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/resources/chat.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/resources/chat.composite
index c9ce95e2dc..c9ce95e2dc 100644
--- a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/resources/chat.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/resources/chat.composite
diff --git a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 897849ff8d..897849ff8d 100644
--- a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
index 5cc16685b6..5cc16685b6 100644
--- a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/chat.html b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/chat.html
index 7a449a906a..7a449a906a 100644
--- a/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/chat.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/chat-webapp/src/main/webapp/chat.html
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/README
index 67c1aa32d5..67c1aa32d5 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/README
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/build.xml
index 7f2483f6fb..7f2483f6fb 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/build.xml
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/databinding-echo.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/databinding-echo.png
index afbbfff285..afbbfff285 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/databinding-echo.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/databinding-echo.png
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/databinding-echo.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/databinding-echo.svg
index 87964abf86..87964abf86 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/databinding-echo.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/databinding-echo.svg
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/pom.xml
index b061b0e2a9..b061b0e2a9 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
index 5679614164..5679614164 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
index ff8968837d..ff8968837d 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Echo.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Echo.java
index 25ecc90454..25ecc90454 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Echo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Echo.java
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
index 9ec3819899..9ec3819899 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Interface1.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Interface1.java
index 70b450e358..70b450e358 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Interface1.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Interface1.java
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Interface2.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Interface2.java
index b62f1f425d..b62f1f425d 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Interface2.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/java/dbecho/Interface2.java
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/resources/EchoDataBinding.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
index 2f042b8e34..2f042b8e34 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
index ef2308aa73..ef2308aa73 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
diff --git a/branches/sca-java-1.2.1/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
index 43434d8cee..43434d8cee 100644
--- a/branches/sca-java-1.2.1/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/domain-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/README
index fe83e16a55..fe83e16a55 100644
--- a/branches/sca-java-1.2.1/samples/domain-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/domain-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/build.xml
index e38f430d58..e38f430d58 100644
--- a/branches/sca-java-1.2.1/samples/domain-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/build.xml
diff --git a/branches/sca-java-1.2.1/samples/domain-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/pom.xml
index 3df19fe3bf..3df19fe3bf 100644
--- a/branches/sca-java-1.2.1/samples/domain-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/java/node/DomainServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/java/node/DomainServer.java
index ea3cddc01b..ea3cddc01b 100644
--- a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/java/node/DomainServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/java/node/DomainServer.java
diff --git a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml
index fbe5880db6..fbe5880db6 100644
--- a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/domain.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/domain.composite
index dbaaebd3c7..dbaaebd3c7 100644
--- a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/domain.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/domain.composite
diff --git a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/index.html b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/index.html
index 425bd73734..425bd73734 100644
--- a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/index.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/index.html
diff --git a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/node.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/node.png
index b3c949d224..b3c949d224 100644
--- a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/node.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/node.png
diff --git a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/style.css b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/style.css
index f5bbf23379..f5bbf23379 100644
--- a/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/style.css
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/domain-webapp/src/main/resources/webroot/style.css
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/README
index 3668a7705e..3668a7705e 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/feed-aggregator-webapp.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
index 1af95a5eff..1af95a5eff 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
index a861a5c50f..a861a5c50f 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/pom.xml
index 1e1d8db7b8..1e1d8db7b8 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
index 3d259e66b1..3d259e66b1 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
index dec073c36b..dec073c36b 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
index ea7d252ed4..ea7d252ed4 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
index 18ebbdf469..18ebbdf469 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
index b67fe843ca..b67fe843ca 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
index dea3980e4d..dea3980e4d 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/index.html b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/index.html
index e20f2fdf81..e20f2fdf81 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/index.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator-webapp/src/main/webapp/index.html
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/README
index 5dfe430b83..5dfe430b83 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/README
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/build.xml
index 2118e13db7..2118e13db7 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/build.xml
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator/feed-aggregator.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/feed-aggregator.png
index c8fea8a7b8..c8fea8a7b8 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator/feed-aggregator.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/feed-aggregator.png
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator/feed-aggregator.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/feed-aggregator.svg
index 72fe6a00ac..72fe6a00ac 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator/feed-aggregator.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/feed-aggregator.svg
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/pom.xml
index afa69d6f08..afa69d6f08 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
index 5c713f9ca4..5c713f9ca4 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/SampleServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/SampleServer.java
index 2aace3daf7..2aace3daf7 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/SampleServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/SampleServer.java
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/Sort.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/Sort.java
index dec073c36b..dec073c36b 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/Sort.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/Sort.java
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/SortImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/SortImpl.java
index ea7d252ed4..ea7d252ed4 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/SortImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/java/feed/SortImpl.java
diff --git a/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/resources/FeedAggregator.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
index 836499e58f..836499e58f 100644
--- a/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/README
index bf5f500ef3..bf5f500ef3 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/build.xml
index 79c77393b9..79c77393b9 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/helloworld-bpel.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/helloworld-bpel.png
index 5f53a3c5d1..5f53a3c5d1 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/helloworld-bpel.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/helloworld-bpel.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/helloworld-bpel.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/helloworld-bpel.svg
index 5a98f1a07c..5a98f1a07c 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/helloworld-bpel.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/helloworld-bpel.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/pom.xml
index 6a4e7090f1..6a4e7090f1 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
index 1826c885c4..1826c885c4 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/deploy.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/deploy.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/deploy.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.bpel
index e983899d76..e983899d76 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.bpel
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.componentType
index 121064a475..121064a475 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.componentType
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/log4j.properties
index 8649a71550..8649a71550 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/log4j.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/main/resources/log4j.properties
diff --git a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
index 1caaa78878..1caaa78878 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/README
index 38392a13b6..38392a13b6 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/build-dojo.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/build-dojo.xml
index 534a1dacd9..534a1dacd9 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/build-dojo.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/build-dojo.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/build.xml
index 95813af65a..95813af65a 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
index d5c3bc5d3e..d5c3bc5d3e 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/pom.xml
index 12a188b60d..12a188b60d 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
index 3d8ea24f04..3d8ea24f04 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
index e205f4da9b..e205f4da9b 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
index e895ab455d..e895ab455d 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
index 4195f3288c..4195f3288c 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 2c178c1ddc..2c178c1ddc 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
index 70cd67890a..70cd67890a 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/style.css b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/style.css
index 1071583264..1071583264 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/style.css
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-dojo-webapp/src/main/webapp/style.css
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/README
index 9be2e0b0f6..9be2e0b0f6 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/pom.xml
index e2c7f90f43..e2c7f90f43 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
index c24a741ee2..c24a741ee2 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
index 2af978b9ce..2af978b9ce 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
index 280388f443..280388f443 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
index 2419887413..2419887413 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
index f6328d156c..f6328d156c 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
index 3fe18f670f..3fe18f670f 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
index 830f0d4b84..830f0d4b84 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/README
index 07253d039b..07253d039b 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
index 6ef1f438fb..6ef1f438fb 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/pom.xml
index abc772a2dc..abc772a2dc 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
index 3d8ea24f04..3d8ea24f04 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
index 35fd00fabd..35fd00fabd 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
index e895ab455d..e895ab455d 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
index 75dd9050fa..75dd9050fa 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 2c178c1ddc..2c178c1ddc 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
index 267bed176c..267bed176c 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
index 1071583264..1071583264 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/README
index abf10ef1f2..abf10ef1f2 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/build.xml
index 6c8b6255ce..6c8b6255ce 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/helloworld-ws-reference.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/helloworld-ws-reference.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/helloworld-ws-reference.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/helloworld-ws-reference.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/helloworld-ws-reference.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/helloworld-ws-reference.svg
index 333ad53e0a..333ad53e0a 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/helloworld-ws-reference.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/helloworld-ws-reference.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/pom.xml
index 1c827a1daf..1c827a1daf 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
index fc9142db36..fc9142db36 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
index db0c947cf7..db0c947cf7 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
index 0dee19550b..0dee19550b 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
index 3cf1104562..3cf1104562 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
index 6ccc48c3f6..6ccc48c3f6 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/logging.properties b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/logging.properties
index 6c7581e7f4..6c7581e7f4 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/logging.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/logging.properties
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
index e0ea596dd3..e0ea596dd3 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
index ff547f2159..ff547f2159 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/README
index fa6ceff63f..fa6ceff63f 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/build.xml
index 5a05e9cd28..5a05e9cd28 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/helloworld-ws-service.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/helloworld-ws-service.png
index eab29d0bcd..eab29d0bcd 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/helloworld-ws-service.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/helloworld-ws-service.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/helloworld-ws-service.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/helloworld-ws-service.svg
index 8d2ae98c82..8d2ae98c82 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/helloworld-ws-service.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/helloworld-ws-service.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/pom.xml
index 0eff6c5d31..0eff6c5d31 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
index 29b8e58298..29b8e58298 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
index 7245513b2a..7245513b2a 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/definitions.xml
index 9cf337ac98..9cf337ac98 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
index 4565a50f65..4565a50f65 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
index 3f9e00689e..3f9e00689e 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
index ba8bc8138e..ba8bc8138e 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/README
index 0d2141dda5..0d2141dda5 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/build.xml
index e4edb94054..e4edb94054 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/pom.xml
index 9ced03812f..9ced03812f 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite
index 114608e4d8..114608e4d8 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl
index 0b95fbd14f..0b95fbd14f 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml
index 182fd38fd9..182fd38fd9 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/README
index abf10ef1f2..abf10ef1f2 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/build.xml
index 4f83c8ae9d..4f83c8ae9d 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
index 333ad53e0a..333ad53e0a 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/pom.xml
index a8b3e937d4..a8b3e937d4 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
index b3db243a1f..b3db243a1f 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
index db0c947cf7..db0c947cf7 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
index 0dee19550b..0dee19550b 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
index d029ba3e1c..d029ba3e1c 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
index a4eb217310..a4eb217310 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
index 12b0716b5d..12b0716b5d 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/README
index 4d21b9a18a..4d21b9a18a 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/build.xml
index 2e924dda7b..2e924dda7b 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
index 333ad53e0a..333ad53e0a 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/pom.xml
index 90989682b0..90989682b0 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
index aab6aad379..aab6aad379 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
index a47d24ca01..a47d24ca01 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
index db0c947cf7..db0c947cf7 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
index 0dee19550b..0dee19550b 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
index d9f22b448d..d9f22b448d 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
index 0b4f2399f0..0b4f2399f0 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
index 904befaf60..904befaf60 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
index d39c89cb95..d39c89cb95 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
index e6fcc6f4a6..e6fcc6f4a6 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
index 7ce89179c2..7ce89179c2 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
index 4b0c40dafd..4b0c40dafd 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/README
index 13c89ab2f6..13c89ab2f6 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/build.xml
index 71ee66b31e..71ee66b31e 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/helloworld-ws-reference.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/helloworld-ws-reference.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/helloworld-ws-reference.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/helloworld-ws-reference.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/helloworld-ws-reference.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/helloworld-ws-reference.svg
index 354ffbae8f..354ffbae8f 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/helloworld-ws-reference.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/helloworld-ws-reference.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/pom.xml
index 0eaba4cafc..0eaba4cafc 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
index 4559b282fe..4559b282fe 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
index db0c947cf7..db0c947cf7 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
index 0dee19550b..0dee19550b 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
index 899ad5ce35..899ad5ce35 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/logging.properties b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/logging.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/logging.properties
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
index 662c9affac..662c9affac 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
index 7ce89179c2..7ce89179c2 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
index 8226ec884e..8226ec884e 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/README
index 1348dbf0e5..1348dbf0e5 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/build.xml
index 386008e707..386008e707 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
index 2590f02a45..2590f02a45 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
index 56a29db23c..56a29db23c 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/pom.xml
index a1f715ef76..a1f715ef76 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
index eb82418516..eb82418516 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
index fea4e2a16c..fea4e2a16c 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
index 3d6576aca0..3d6576aca0 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
index 34396b1b02..34396b1b02 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
index fe79094b94..fe79094b94 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
index 584adfdcdf..584adfdcdf 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
index bc1550b5dd..bc1550b5dd 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 6f241cc90c..6f241cc90c 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 22c6f5db0f..22c6f5db0f 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
index 257e65aad4..257e65aad4 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/README
index 4cecbb4bce..4cecbb4bce 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/build.xml
index 401315d424..401315d424 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/helloworld-ws-sdo.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
index 333ad53e0a..333ad53e0a 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/pom.xml
index 9ed5f1dd13..9ed5f1dd13 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
index de4795ceaf..de4795ceaf 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
index c950f7df04..c950f7df04 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
index 367c5b4a12..367c5b4a12 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
index 711eef63b5..711eef63b5 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
index c255df2897..c255df2897 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
index d4fba548d5..d4fba548d5 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/logging.properties b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/logging.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/logging.properties
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
index 2ecc0bea43..2ecc0bea43 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
index 11564c370f..11564c370f 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
index 4b0c40dafd..4b0c40dafd 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/README
index fa6ceff63f..fa6ceff63f 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/build.xml
index 5a05e9cd28..5a05e9cd28 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/helloworld-ws-service.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/helloworld-ws-service.png
index eab29d0bcd..eab29d0bcd 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/helloworld-ws-service.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/helloworld-ws-service.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/helloworld-ws-service.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
index 8d2ae98c82..8d2ae98c82 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/pom.xml
index cc30acc347..cc30acc347 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
index 5baf8ef645..5baf8ef645 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
index 7245513b2a..7245513b2a 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
index 9cf337ac98..9cf337ac98 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
index 67079f738e..67079f738e 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
index 10faf374f3..10faf374f3 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
index 3f9e00689e..3f9e00689e 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
index 755caad824..755caad824 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
index cd026b0538..cd026b0538 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/README
index 354071a8b5..354071a8b5 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/build.xml
index 52c87ef675..52c87ef675 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
index 6f7d9dd450..6f7d9dd450 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
index 53eb552923..53eb552923 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/pom.xml
index dd43a940f9..dd43a940f9 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
index 7245513b2a..7245513b2a 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
index def19b4f40..def19b4f40 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
index 1f4a8ff819..1f4a8ff819 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
index 0b4f2399f0..0b4f2399f0 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
index d1e18d7929..d1e18d7929 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
index 068229be6f..068229be6f 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
index 26c222cece..26c222cece 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/README
index 0d2141dda5..0d2141dda5 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/build.xml
index e2f356f329..e2f356f329 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/pom.xml
index ce4d907751..ce4d907751 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
index 0b95fbd14f..0b95fbd14f 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
index 114608e4d8..114608e4d8 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 0c1bde0eda..0c1bde0eda 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
index 3f3c92fa78..3f3c92fa78 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/README
index 44dc7ab4e8..44dc7ab4e8 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/README
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/build.xml
index 46678febc3..46678febc3 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/build.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service/helloworld-ws-service.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/helloworld-ws-service.png
index eab29d0bcd..eab29d0bcd 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service/helloworld-ws-service.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/helloworld-ws-service.png
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service/helloworld-ws-service.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/helloworld-ws-service.svg
index 61cd93ead9..61cd93ead9 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service/helloworld-ws-service.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/helloworld-ws-service.svg
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/pom.xml
index de48598941..de48598941 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
index 7cd98ae578..7cd98ae578 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
index 7245513b2a..7245513b2a 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
index d767625ae7..d767625ae7 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
index 454763410c..454763410c 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
index 189332be91..189332be91 100644
--- a/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/README
index 27de00e8ef..27de00e8ef 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/README
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/build.xml
index 7aa31aab8b..7aa31aab8b 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/build.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/implementation-composite.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/implementation-composite.png
index 4c6d71bc03..4c6d71bc03 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/implementation-composite.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/implementation-composite.png
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/implementation-composite.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/implementation-composite.svg
index 0e60354aab..0e60354aab 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/implementation-composite.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/implementation-composite.svg
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/pom.xml
index a2532e58a6..a2532e58a6 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/CompositeClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/CompositeClient.java
index bf743e1797..bf743e1797 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/CompositeClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/CompositeClient.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Source.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Source.java
index d0efcc1df1..d0efcc1df1 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Source.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Source.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceCallback.java
index baa95a8e39..baa95a8e39 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceCallback.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceImpl.java
index b9a0c7ff74..b9a0c7ff74 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Target.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Target.java
index 9a8f68a7fa..9a8f68a7fa 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Target.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Target.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/TargetImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/TargetImpl.java
index 86686e9233..86686e9233 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/TargetImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/TargetImpl.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite.composite
index 3376ac8ff5..3376ac8ff5 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite.composite
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite2.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite2.composite
index c9eff4fa9d..c9eff4fa9d 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite2.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite2.composite
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
index c8039b7dc7..c8039b7dc7 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/OuterComposite.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/OuterComposite.composite
index cb1c1e13d4..cb1c1e13d4 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/OuterComposite.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/OuterComposite.composite
diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
index 9e9a4b44a4..9e9a4b44a4 100644
--- a/branches/sca-java-1.2.1/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/README
index 5e8190648f..5e8190648f 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/README
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/build.xml
index 88d308e6fc..88d308e6fc 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/build.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/pom.xml
index 595f316265..595f316265 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUD.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
index b23d85887b..b23d85887b 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
index 49be844f93..49be844f93 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
index fa83c63c1b..fa83c63c1b 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
index cc0795a735..cc0795a735 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
index 2f1e5fcba8..2f1e5fcba8 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
index 383a035e69..383a035e69 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
index b212ee3c9b..b212ee3c9b 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
index 8f11f9d910..8f11f9d910 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
index 4566cb7155..4566cb7155 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
index 3cf5de5fa1..3cf5de5fa1 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 17c98cf706..17c98cf706 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 527c626418..527c626418 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 6ce605197a..6ce605197a 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
index 447e31bf93..447e31bf93 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
index 0bb5cfc361..0bb5cfc361 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/test/resources/crud.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/test/resources/crud.composite
index 18745033bb..18745033bb 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/test/resources/crud.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud-extension/src/test/resources/crud.composite
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/README
index 50da631c04..50da631c04 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/README
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/build.xml
index 10b26b5a94..10b26b5a94 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/build.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud/implementation-crud.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/implementation-crud.png
index a292037e7a..a292037e7a 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud/implementation-crud.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/implementation-crud.png
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud/implementation-crud.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/implementation-crud.svg
index dbb37be208..dbb37be208 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud/implementation-crud.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/implementation-crud.svg
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/pom.xml
index 33c3d02eb5..33c3d02eb5 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
index ea87cb3001..ea87cb3001 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud/src/main/resources/crud.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/src/main/resources/crud.composite
index 18745033bb..18745033bb 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud/src/main/resources/crud.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/src/main/resources/crud.composite
diff --git a/branches/sca-java-1.2.1/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
index 7e0476a8b1..7e0476a8b1 100644
--- a/branches/sca-java-1.2.1/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/README
index 772d80a283..772d80a283 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/README
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/build.xml
index 7d8770e121..7d8770e121 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/build.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/implementation-notification.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/implementation-notification.png
index 0b7ee34bf7..0b7ee34bf7 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/implementation-notification.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/implementation-notification.png
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/pom.xml
index 7634427d63..7634427d63 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
index 4f09c5c65b..4f09c5c65b 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
index fcbb4fcdf7..fcbb4fcdf7 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java
index 018535d826..018535d826 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
index ff2aaffdd0..ff2aaffdd0 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
index f2dc318206..f2dc318206 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
index 873e200613..873e200613 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
index bbf2281352..bbf2281352 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
index 5f8ba5ff31..5f8ba5ff31 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
index 873e200613..873e200613 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
diff --git a/branches/sca-java-1.2.1/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
index bbf2281352..bbf2281352 100644
--- a/branches/sca-java-1.2.1/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/README
index 3b201779e1..3b201779e1 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/README
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/build.xml
index 78bae79859..78bae79859 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/build.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/pom.xml
index 060f516900..060f516900 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
index 7c2f5d236f..7c2f5d236f 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
index bbcfb3d0dc..bbcfb3d0dc 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
index 0dad270a6c..0dad270a6c 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
index f2d6871039..f2d6871039 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
index fbdbd9de79..fbdbd9de79 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
index 87333c61f6..87333c61f6 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
index 73a0d22493..73a0d22493 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
index 22f2be09e9..22f2be09e9 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 8337e81c5f..8337e81c5f 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 64dd230a15..64dd230a15 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index b30ea3b9cf..b30ea3b9cf 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
index 075af98240..075af98240 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
index c9d170770b..c9d170770b 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
index cc32929f09..cc32929f09 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
index 0580e30aba..0580e30aba 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
index 69ab1f567e..69ab1f567e 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
index d8b5f41adc..d8b5f41adc 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
index a92c5ab8db..a92c5ab8db 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
index c38094dfc9..c38094dfc9 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/README
index e6b285d82d..e6b285d82d 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/README
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/build.xml
index ee61db0467..ee61db0467 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/build.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/pom.xml
index dbd04b9344..dbd04b9344 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorld.java
index cc32929f09..cc32929f09 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldClient.java
index 34d9e3a463..34d9e3a463 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldImpl.java
index 0580e30aba..0580e30aba 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldImpl2.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldImpl2.java
index 69ab1f567e..69ab1f567e 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldImpl2.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/java/helloworld/HelloWorldImpl2.java
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/resources/helloworld/HelloWorldImpl2.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/resources/helloworld/HelloWorldImpl2.componentType
index a92c5ab8db..a92c5ab8db 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/resources/helloworld/HelloWorldImpl2.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/resources/helloworld/HelloWorldImpl2.componentType
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/resources/helloworld/helloworld.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/resources/helloworld/helloworld.composite
index c38094dfc9..c38094dfc9 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/resources/helloworld/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/main/resources/helloworld/helloworld.composite
diff --git a/branches/sca-java-1.2.1/samples/implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
index d8b5f41adc..d8b5f41adc 100644
--- a/branches/sca-java-1.2.1/samples/implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/loanapplication/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/pom.xml
index 3a3962cfba..3a3962cfba 100644
--- a/branches/sca-java-1.2.1/samples/loanapplication/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
index 4fedb70782..4fedb70782 100644
--- a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
diff --git a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
index 5183ece867..5183ece867 100644
--- a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
diff --git a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
index 7e4438bbff..7e4438bbff 100644
--- a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
diff --git a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
index b06d9465a2..b06d9465a2 100644
--- a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
diff --git a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanService.java
index 9dfd8b42fe..9dfd8b42fe 100644
--- a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanService.java
diff --git a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
index 76a53323bd..76a53323bd 100644
--- a/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/loanapplication/src/main/resources/loanapplication.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/resources/loanapplication.composite
index 3aa8d030b7..3aa8d030b7 100644
--- a/branches/sca-java-1.2.1/samples/loanapplication/src/main/resources/loanapplication.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/main/resources/loanapplication.composite
diff --git a/branches/sca-java-1.2.1/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
index e88e48a53a..e88e48a53a 100644
--- a/branches/sca-java-1.2.1/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/README
index 11fecf2ae8..11fecf2ae8 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/README
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/build-bundles.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/build-bundles.xml
index 7a31e6016b..7a31e6016b 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/build-bundles.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/build-bundles.xml
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/build.xml
index 2e103e5a15..2e103e5a15 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/build.xml
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/osgi-supplychain.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/osgi-supplychain.png
index 2bec57ac8a..2bec57ac8a 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/osgi-supplychain.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/osgi-supplychain.png
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/osgi-supplychain.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/osgi-supplychain.svg
index 43cb427944..43cb427944 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/osgi-supplychain.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/osgi-supplychain.svg
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/pom.xml
index 0c2842b5a8..0c2842b5a8 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
index 5f40054ada..5f40054ada 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
index 64814487cb..64814487cb 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
index 225dce0236..225dce0236 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 023d716651..023d716651 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a1c7fce60a..a1c7fce60a 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 4647a716c7..4647a716c7 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index d0d29f94f8..d0d29f94f8 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index 1b7fb15bf1..1b7fb15bf1 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e97331c06c..e97331c06c 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 4206ce7dc8..4206ce7dc8 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index 0f88cca213..0f88cca213 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index f55a068ede..f55a068ede 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index 72eec76cc2..72eec76cc2 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 600f3f0c74..600f3f0c74 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index b8bca97bd0..b8bca97bd0 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Customer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Customer.componentType
index 5c61a0961c..5c61a0961c 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Customer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Customer.componentType
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
index 87a184d968..87a184d968 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
index 872ab6601a..872ab6601a 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSShipper.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
index 57fcbbc5d1..57fcbbc5d1 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
index 75fa8029f7..75fa8029f7 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Retailer.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Retailer.componentType
index 15185f2bf9..15185f2bf9 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Retailer.componentType
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Shipper.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Shipper.componentType
index 675597d80b..675597d80b 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Shipper.componentType
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Warehouse.componentType b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
index 6e1ac3e5a9..6e1ac3e5a9 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
index e3844bc220..e3844bc220 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
index f09c3501c3..f09c3501c3 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
index b7ced3ade6..b7ced3ade6 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
index c36f89bd91..c36f89bd91 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
index 89ecd4e8c8..89ecd4e8c8 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
index 5b368afd5b..5b368afd5b 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
index 16514b94d5..16514b94d5 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
index cae7fdfde2..cae7fdfde2 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
index fd91e37b35..fd91e37b35 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
index d894309b71..d894309b71 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
index 2624b968bd..2624b968bd 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
index fc86a76784..fc86a76784 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/supplychain.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/supplychain.composite
index 0bbfed9176..0bbfed9176 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/supplychain.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/supplychain.composite
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
index d1e11168e2..d1e11168e2 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
diff --git a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
index ff15c0d9a2..ff15c0d9a2 100644
--- a/branches/sca-java-1.2.1/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/pom.xml
index 55e6ca66c7..55e6ca66c7 100644
--- a/branches/sca-java-1.2.1/samples/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/README
index c380269deb..c380269deb 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/README
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/build.xml
index c54ad91b63..c54ad91b63 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/build.xml
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/pom.xml
index 542f311194..542f311194 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
index 8a42136b5d..8a42136b5d 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
index 41d78683cc..41d78683cc 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
index f744a59744..f744a59744 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
index 374c0825e9..374c0825e9 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
index fbe38b8269..fbe38b8269 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
index d2d175430b..d2d175430b 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
index 06c3945a6e..06c3945a6e 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
index 4ab64dd558..4ab64dd558 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
index 85508eaa46..85508eaa46 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
index 26331381a8..26331381a8 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
index 6144dcc17f..6144dcc17f 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
index 43b2d41a5d..43b2d41a5d 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
index cfd201f883..cfd201f883 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
index 20fe73fd92..20fe73fd92 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
index 48a4364cd5..48a4364cd5 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
index d02190ab94..d02190ab94 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
index d504f40f04..d504f40f04 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
index cc50da164a..cc50da164a 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
index cf41ab528d..cf41ab528d 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
index 4946854f13..4946854f13 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
index 4c437586ef..4c437586ef 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
index b164eb2b98..b164eb2b98 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
index 96c2af138a..96c2af138a 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/xqueryquotews.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/xqueryquotews.composite
index cce6a728cc..cce6a728cc 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/xqueryquotews.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/xqueryquotews.composite
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
index f078b9ee9f..f078b9ee9f 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
index 9555532b3e..9555532b3e 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
index 9a4be5bda6..9a4be5bda6 100644
--- a/branches/sca-java-1.2.1/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/README
index 900a006141..900a006141 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/README
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/build.xml
index ecc2596d71..ecc2596d71 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/build.xml
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/pom.xml
index b9993fa0bc..b9993fa0bc 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/simple-bigbank-spring.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/simple-bigbank-spring.png
index 593c047f6a..593c047f6a 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/simple-bigbank-spring.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/simple-bigbank-spring.png
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/simple-bigbank-spring.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/simple-bigbank-spring.svg
index c64f6de6b9..c64f6de6b9 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/simple-bigbank-spring.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/simple-bigbank-spring.svg
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
index 1625ff5b65..1625ff5b65 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
index 7c9082b944..7c9082b944 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
index ae9071445d..ae9071445d 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/Account.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/Account.java
index a5ae7b3955..a5ae7b3955 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/Account.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/Account.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataService.java
index c354de387b..c354de387b 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataService.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
index 000acb935c..000acb935c 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/CheckingAccount.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/CheckingAccount.java
index 11bdff757e..11bdff757e 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/CheckingAccount.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/CheckingAccount.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/SavingsAccount.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/SavingsAccount.java
index b791024076..b791024076 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/SavingsAccount.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/SavingsAccount.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/StockAccount.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/StockAccount.java
index 86246a3f84..86246a3f84 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/StockAccount.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/StockAccount.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
index edbf910d37..edbf910d37 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 0512d40b0b..0512d40b0b 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
index 2d97b57066..2d97b57066 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.xml
index 2d882472fb..2d882472fb 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.xml
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/BigBank.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
index 29d4a2d5a3..29d4a2d5a3 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/StockQuote.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/StockQuote.composite
index 26bdc59075..26bdc59075 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/StockQuote.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/main/resources/StockQuote.composite
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
index ba6c1dd797..ba6c1dd797 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/README
index acbe93a4d3..acbe93a4d3 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/README
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/build.xml
index a814014eae..a814014eae 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/build.xml
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/pom.xml
index 3c27bb2f3d..3c27bb2f3d 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/simple-bigbank.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/simple-bigbank.png
index 593c047f6a..593c047f6a 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/simple-bigbank.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/simple-bigbank.png
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/simple-bigbank.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/simple-bigbank.svg
index c64f6de6b9..c64f6de6b9 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/simple-bigbank.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/simple-bigbank.svg
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
index 1625ff5b65..1625ff5b65 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
index 7c9082b944..7c9082b944 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
index fa85f309c0..fa85f309c0 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
index a5ae7b3955..a5ae7b3955 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
index c354de387b..c354de387b 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
index 000acb935c..000acb935c 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
index 11bdff757e..11bdff757e 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
index b791024076..b791024076 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
index 86246a3f84..86246a3f84 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
index edbf910d37..edbf910d37 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 0512d40b0b..0512d40b0b 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
index 7961279352..7961279352 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/Account.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/Account.composite
index e71615e27e..e71615e27e 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/Account.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/Account.composite
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/BigBank.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/BigBank.composite
index c870f39cab..c870f39cab 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/BigBank.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/BigBank.composite
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/StockQuote.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/StockQuote.composite
index 4f29c14851..4f29c14851 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/StockQuote.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/main/resources/StockQuote.composite
diff --git a/branches/sca-java-1.2.1/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
index ba6c1dd797..ba6c1dd797 100644
--- a/branches/sca-java-1.2.1/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/README
index 6b27718f74..6b27718f74 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/README
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/build.xml
index 10b69bd395..10b69bd395 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/build.xml
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/pom.xml
index 2c2bf7a8ef..2c2bf7a8ef 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/simple-callback-ws.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/simple-callback-ws.png
index 1b6353f5cf..1b6353f5cf 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/simple-callback-ws.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/simple-callback-ws.png
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/simple-callback-ws.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/simple-callback-ws.svg
index 7d9e3de510..7d9e3de510 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/simple-callback-ws.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/simple-callback-ws.svg
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
index 4cc00d6d0f..4cc00d6d0f 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
index ad7c6d8fef..ad7c6d8fef 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
index 48acc0e94f..48acc0e94f 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
index 66cfb2bc8a..66cfb2bc8a 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
index 08057d2fcc..08057d2fcc 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
index eeb0e52163..eeb0e52163 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/resources/simplecallback.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/resources/simplecallback.composite
index 53e7fe66af..53e7fe66af 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/resources/simplecallback.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/resources/simplecallback.composite
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
index 8a6465de3a..8a6465de3a 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
diff --git a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
index 580a7f6b0c..580a7f6b0c 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/README
index 719376f254..719376f254 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/README
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/build.xml
index 47d1ea4bc1..47d1ea4bc1 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/build.xml
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/pom.xml
index 0bae81c562..0bae81c562 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/simple-callback.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/simple-callback.png
index 1b6353f5cf..1b6353f5cf 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/simple-callback.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/simple-callback.png
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/simple-callback.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/simple-callback.svg
index 484b65df9d..484b65df9d 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/simple-callback.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/simple-callback.svg
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyClient.java
index 4cc00d6d0f..4cc00d6d0f 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyClient.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
index 3e2a1df5a5..3e2a1df5a5 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyService.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyService.java
index e78ad6f68f..e78ad6f68f 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyService.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
index b27eea44f5..b27eea44f5 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
index fc5e31d14e..fc5e31d14e 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
index b8987fcd07..b8987fcd07 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/src/main/resources/simplecallback.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/resources/simplecallback.composite
index 33e6f60601..33e6f60601 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/src/main/resources/simplecallback.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/main/resources/simplecallback.composite
diff --git a/branches/sca-java-1.2.1/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
index cbaab8af83..cbaab8af83 100644
--- a/branches/sca-java-1.2.1/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/pom.xml
index cdd18f0b87..cdd18f0b87 100644
--- a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
index 73104c3166..73104c3166 100644
--- a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
diff --git a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java
index 43efae32ca..43efae32ca 100644
--- a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java
diff --git a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
index d65d4c8e4a..d65d4c8e4a 100644
--- a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
diff --git a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
index 198befa928..198befa928 100644
--- a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
diff --git a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
index 95ee37c1aa..95ee37c1aa 100644
--- a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
diff --git a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
index cc32929f09..cc32929f09 100644
--- a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
index 02af1ccf22..02af1ccf22 100644
--- a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
index 5813fda330..5813fda330 100644
--- a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
index fa9cecc160..fa9cecc160 100644
--- a/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-java-1.2.1/samples/store/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/README
index d4797618ff..d4797618ff 100644
--- a/branches/sca-java-1.2.1/samples/store/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/README
diff --git a/branches/sca-java-1.2.1/samples/store/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/build.xml
index 4f7e2a7951..4f7e2a7951 100644
--- a/branches/sca-java-1.2.1/samples/store/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/build.xml
diff --git a/branches/sca-java-1.2.1/samples/store/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/pom.xml
index 52c596ec79..52c596ec79 100644
--- a/branches/sca-java-1.2.1/samples/store/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/store/src/main/java/launch/Launch.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/launch/Launch.java
index 801697abea..801697abea 100644
--- a/branches/sca-java-1.2.1/samples/store/src/main/java/launch/Launch.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/launch/Launch.java
diff --git a/branches/sca-java-1.2.1/samples/store/src/main/java/services/Cart.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/Cart.java
index 916b8b46d2..916b8b46d2 100644
--- a/branches/sca-java-1.2.1/samples/store/src/main/java/services/Cart.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/Cart.java
diff --git a/branches/sca-java-1.2.1/samples/store/src/main/java/services/Catalog.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/Catalog.java
index 2c3b19f579..2c3b19f579 100644
--- a/branches/sca-java-1.2.1/samples/store/src/main/java/services/Catalog.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/Catalog.java
diff --git a/branches/sca-java-1.2.1/samples/store/src/main/java/services/CurrencyConverter.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/CurrencyConverter.java
index e104a0423a..e104a0423a 100644
--- a/branches/sca-java-1.2.1/samples/store/src/main/java/services/CurrencyConverter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/CurrencyConverter.java
diff --git a/branches/sca-java-1.2.1/samples/store/src/main/java/services/CurrencyConverterImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/CurrencyConverterImpl.java
index c354aed447..c354aed447 100644
--- a/branches/sca-java-1.2.1/samples/store/src/main/java/services/CurrencyConverterImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/CurrencyConverterImpl.java
diff --git a/branches/sca-java-1.2.1/samples/store/src/main/java/services/FruitsCatalogImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/FruitsCatalogImpl.java
index 377b3d7e59..377b3d7e59 100644
--- a/branches/sca-java-1.2.1/samples/store/src/main/java/services/FruitsCatalogImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/FruitsCatalogImpl.java
diff --git a/branches/sca-java-1.2.1/samples/store/src/main/java/services/Item.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/Item.java
index 27abd4f016..27abd4f016 100644
--- a/branches/sca-java-1.2.1/samples/store/src/main/java/services/Item.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/Item.java
diff --git a/branches/sca-java-1.2.1/samples/store/src/main/java/services/ShoppingCartImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/ShoppingCartImpl.java
index d04fffe6f1..d04fffe6f1 100644
--- a/branches/sca-java-1.2.1/samples/store/src/main/java/services/ShoppingCartImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/ShoppingCartImpl.java
diff --git a/branches/sca-java-1.2.1/samples/store/src/main/java/services/Total.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/Total.java
index 8f464e526f..8f464e526f 100644
--- a/branches/sca-java-1.2.1/samples/store/src/main/java/services/Total.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/java/services/Total.java
diff --git a/branches/sca-java-1.2.1/samples/store/src/main/resources/store.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/resources/store.composite
index 571678839d..571678839d 100644
--- a/branches/sca-java-1.2.1/samples/store/src/main/resources/store.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/resources/store.composite
diff --git a/branches/sca-java-1.2.1/samples/store/src/main/resources/uiservices/store.html b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/resources/uiservices/store.html
index 095570f949..095570f949 100644
--- a/branches/sca-java-1.2.1/samples/store/src/main/resources/uiservices/store.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/src/main/resources/uiservices/store.html
diff --git a/branches/sca-java-1.2.1/samples/store/store.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/store.png
index da413edeee..da413edeee 100644
--- a/branches/sca-java-1.2.1/samples/store/store.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/store.png
diff --git a/branches/sca-java-1.2.1/samples/store/store.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/store.svg
index 74f8ecd36d..74f8ecd36d 100644
--- a/branches/sca-java-1.2.1/samples/store/store.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/store/store.svg
diff --git a/branches/sca-java-1.2.1/samples/supplychain/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/README
index ea4493fdd4..ea4493fdd4 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/README
diff --git a/branches/sca-java-1.2.1/samples/supplychain/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/build.xml
index 506180b8b1..506180b8b1 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/build.xml
diff --git a/branches/sca-java-1.2.1/samples/supplychain/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/pom.xml
index d39364e7a1..d39364e7a1 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Customer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Customer.java
index 8088001898..8088001898 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Customer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Customer.java
diff --git a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
index 7a1e8553ec..7a1e8553ec 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Retailer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Retailer.java
index 1add63fb4e..1add63fb4e 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Retailer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Retailer.java
diff --git a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
index f622052cf8..f622052cf8 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Shipper.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Shipper.java
index d4d49a922b..d4d49a922b 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Shipper.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Shipper.java
diff --git a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
index 4ae52a12a2..4ae52a12a2 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
index 7072f582d1..7072f582d1 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Warehouse.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Warehouse.java
index 0be499f569..0be499f569 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Warehouse.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/Warehouse.java
diff --git a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
index b5e256a1e0..b5e256a1e0 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
diff --git a/branches/sca-java-1.2.1/samples/supplychain/src/main/resources/supplychain.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/resources/supplychain.composite
index 301efcaf1f..301efcaf1f 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/src/main/resources/supplychain.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/main/resources/supplychain.composite
diff --git a/branches/sca-java-1.2.1/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
index 88e0eb7ab8..88e0eb7ab8 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
diff --git a/branches/sca-java-1.2.1/samples/supplychain/supplychain.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/supplychain.png
index 51a384e827..51a384e827 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/supplychain.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/supplychain.png
diff --git a/branches/sca-java-1.2.1/samples/supplychain/supplychain.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/supplychain.svg
index f72e77acab..f72e77acab 100644
--- a/branches/sca-java-1.2.1/samples/supplychain/supplychain.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/supplychain/supplychain.svg
diff --git a/branches/sca-java-1.2.1/samples/web-resource/README b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/README
index 56bffba6a3..56bffba6a3 100644
--- a/branches/sca-java-1.2.1/samples/web-resource/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/README
diff --git a/branches/sca-java-1.2.1/samples/web-resource/build.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/build.xml
index 5f6b6091e7..5f6b6091e7 100644
--- a/branches/sca-java-1.2.1/samples/web-resource/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/build.xml
diff --git a/branches/sca-java-1.2.1/samples/web-resource/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/pom.xml
index 09c4e81c0b..09c4e81c0b 100644
--- a/branches/sca-java-1.2.1/samples/web-resource/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/pom.xml
diff --git a/branches/sca-java-1.2.1/samples/web-resource/src/main/java/web/resource/SampleServer.java b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/src/main/java/web/resource/SampleServer.java
index 9410de08c4..9410de08c4 100644
--- a/branches/sca-java-1.2.1/samples/web-resource/src/main/java/web/resource/SampleServer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/src/main/java/web/resource/SampleServer.java
diff --git a/branches/sca-java-1.2.1/samples/web-resource/src/main/resources/WebResource.composite b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/src/main/resources/WebResource.composite
index 4536136a8b..4536136a8b 100644
--- a/branches/sca-java-1.2.1/samples/web-resource/src/main/resources/WebResource.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/src/main/resources/WebResource.composite
diff --git a/branches/sca-java-1.2.1/samples/web-resource/src/main/resources/myContent/index.html b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/src/main/resources/myContent/index.html
index 55de048373..55de048373 100644
--- a/branches/sca-java-1.2.1/samples/web-resource/src/main/resources/myContent/index.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/src/main/resources/myContent/index.html
diff --git a/branches/sca-java-1.2.1/samples/web-resource/web-resource.png b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/web-resource.png
index 7259447b65..7259447b65 100644
--- a/branches/sca-java-1.2.1/samples/web-resource/web-resource.png
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/web-resource.png
diff --git a/branches/sca-java-1.2.1/samples/web-resource/web-resource.svg b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/web-resource.svg
index 0d1257316c..0d1257316c 100644
--- a/branches/sca-java-1.2.1/samples/web-resource/web-resource.svg
+++ b/sca-java-1.x/branches/sca-java-1.2.1/samples/web-resource/web-resource.svg
diff --git a/branches/sca-java-1.2.1/tools/eclipse/features/feature/.project b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/features/feature/.project
index 4c25cefc21..4c25cefc21 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/features/feature/.project
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/features/feature/.project
diff --git a/branches/sca-java-1.2.1/tools/eclipse/features/feature/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/features/feature/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/features/feature/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/features/feature/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/tools/eclipse/features/feature/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/features/feature/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/features/feature/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/features/feature/LICENSE
diff --git a/branches/sca-java-1.2.1/tools/eclipse/features/feature/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/features/feature/META-INF/MANIFEST.MF
index ce70304f18..ce70304f18 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/features/feature/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/features/feature/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.2.1/tools/eclipse/features/feature/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/features/feature/NOTICE
index 9f7a43e735..9f7a43e735 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/features/feature/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/features/feature/NOTICE
diff --git a/branches/sca-java-1.2.1/tools/eclipse/features/feature/build.properties b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/features/feature/build.properties
index f0554b02c5..f0554b02c5 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/features/feature/build.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/features/feature/build.properties
diff --git a/branches/sca-java-1.2.1/tools/eclipse/features/feature/feature.xml b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/features/feature/feature.xml
index f0e05fa0ac..f0e05fa0ac 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/features/feature/feature.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/features/feature/feature.xml
diff --git a/branches/sca-java-1.2.1/tools/eclipse/features/feature/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/features/feature/pom.xml
index df324c4516..df324c4516 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/features/feature/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/features/feature/pom.xml
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/.classpath b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/.classpath
index fd5bc59a28..fd5bc59a28 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/.classpath
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/.classpath
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/.project b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/.project
index fa874620ec..fa874620ec 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/.project
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/.project
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/LICENSE
index e491de655a..e491de655a 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/LICENSE
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
index 485a44e665..485a44e665 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/NOTICE
index 64cbaac65e..64cbaac65e 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/NOTICE
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/build.properties b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/build.properties
index 201cd99b4f..201cd99b4f 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/build.properties
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/build.properties
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/icons/t.gif b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/icons/t.gif
index 54529ab4d8..54529ab4d8 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/icons/t.gif
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/icons/t.gif
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/icons/tuscany.gif b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/icons/tuscany.gif
index 849dd76d4a..849dd76d4a 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/icons/tuscany.gif
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/icons/tuscany.gif
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainer.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainer.java
index 0b3ff3774a..0b3ff3774a 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainer.java
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainerInitializer.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainerInitializer.java
index c82281b243..c82281b243 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainerInitializer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainerInitializer.java
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyLibraryEntryPage.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyLibraryEntryPage.java
index 0bc1734253..0bc1734253 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyLibraryEntryPage.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyLibraryEntryPage.java
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationDelegate.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationDelegate.java
index a2050e44d9..a2050e44d9 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationDelegate.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationDelegate.java
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationTabGroup.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationTabGroup.java
index 738fe2638e..738fe2638e 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationTabGroup.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationTabGroup.java
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchShortcut.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchShortcut.java
index 73845b12af..73845b12af 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchShortcut.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchShortcut.java
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizard.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizard.java
index 09b800fe1b..09b800fe1b 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizard.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizard.java
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizardPage.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizardPage.java
index 08407e9993..08407e9993 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizardPage.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizardPage.java
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizard.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizard.java
index f07f0b643c..f07f0b643c 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizard.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizard.java
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizardPage.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizardPage.java
index aab0177f73..aab0177f73 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizardPage.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizardPage.java
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/plugin.xml b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/plugin.xml
index e1596c0b91..e1596c0b91 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/plugin.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/plugin.xml
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/pom.xml
index f34d2d7075..f34d2d7075 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/pom.xml
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-all.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-all.xsd
index 1b19ede427..1b19ede427 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-all.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-all.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd
index 26bedfcce5..26bedfcce5 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd
index 850f32b56a..850f32b56a 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd
index c7ea897cbf..c7ea897cbf 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd
index 3e92de193b..3e92de193b 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-contribution.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
index c7f92f6c3b..c7f92f6c3b 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-core.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-core.xsd
index 1c6291792b..1c6291792b 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-core.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-core.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-definitions.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-definitions.xsd
index 0249882a92..0249882a92 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-definitions.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-definitions.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd
index 87b443fb36..87b443fb36 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd
index 99669bc672..99669bc672 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd
index 6f1cf14a4b..6f1cf14a4b 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
index 1bca6199cb..1bca6199cb 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd
index f9d8171b8e..f9d8171b8e 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd
index 1cf9fb3ea9..1cf9fb3ea9 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd
index 44f14e5ed5..44f14e5ed5 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd
index 81f939bdb4..81f939bdb4 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd
index c1fdfd8f3c..c1fdfd8f3c 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-policy.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-policy.xsd
index c22ffd6618..c22ffd6618 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-policy.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca-policy.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca.xsd
index 10f54275d0..10f54275d0 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/sca.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
index c93a1d72de..c93a1d72de 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
index d0da5421ec..d0da5421ec 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd
index ff48b97d7a..ff48b97d7a 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
index 7c79738898..7c79738898 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd
index 6d5468b2f9..6d5468b2f9 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
index 2697a1ea98..2697a1ea98 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
index 821f323d73..821f323d73 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
index 1b5c8aece2..1b5c8aece2 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
index f8d437310e..f8d437310e 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
index f8ece54a07..f8ece54a07 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
index dd596821ea..dd596821ea 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd
index e1723d65f0..e1723d65f0 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
index 0c0998595f..0c0998595f 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
index cdabb697aa..cdabb697aa 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd
index da5e696e01..da5e696e01 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd
diff --git a/branches/sca-java-1.2.1/tools/eclipse/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/pom.xml
index 5db2207e79..5db2207e79 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/pom.xml
diff --git a/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/.project b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/.project
index b22070f414..b22070f414 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/.project
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/.project
diff --git a/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/LICENSE
index 9ceb29151b..9ceb29151b 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/LICENSE
diff --git a/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/NOTICE
index 64cbaac65e..64cbaac65e 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/NOTICE
diff --git a/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/README b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/README
index 23f1e09159..23f1e09159 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/README
diff --git a/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/pom.xml
index 131549874a..131549874a 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/pom.xml
diff --git a/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/site.xml b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/site.xml
index f884f48191..f884f48191 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/site.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/site.xml
diff --git a/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
index d9916b0602..d9916b0602 100644
--- a/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/LICENSE
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/NOTICE
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/pom.xml
index b411fe97a6..b411fe97a6 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/pom.xml
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
index 60afe70534..60afe70534 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
index d5832e23aa..d5832e23aa 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
index 3323113af4..3323113af4 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
index e8f3db95b0..e8f3db95b0 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
index 1eed03334a..1eed03334a 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
index 675490bab3..675490bab3 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
index fd10c77f8b..fd10c77f8b 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
index 18cfafa4e3..18cfafa4e3 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
index 3750dc27f5..3750dc27f5 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
index 319eb6c65a..319eb6c65a 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
index c840f54841..c840f54841 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
index cb41c56b94..cb41c56b94 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
index df8760b58c..df8760b58c 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
index e30ada3af5..e30ada3af5 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
index 788d162f34..788d162f34 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
index b30b8cd62b..b30b8cd62b 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/resources/META-INF/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
index 135b374357..135b374357 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
index dfebd77215..dfebd77215 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
index 0df8c67689..0df8c67689 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
index c587252d23..c587252d23 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
index bf49d98888..bf49d98888 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
index cf83095852..cf83095852 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
index 901da8e551..901da8e551 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
index 78a64dcc64..78a64dcc64 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/resources/AccountService.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/resources/AccountService.wsdl
index 6c022aea4b..6c022aea4b 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/resources/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/resources/AccountService.wsdl
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
index 09d1a58589..09d1a58589 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/resources/helloworld.wsdl
index 051f604bb2..051f604bb2 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/resources/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/resources/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/resources/interopdoc.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/resources/interopdoc.wsdl
index 820c26ca34..820c26ca34 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/resources/interopdoc.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/resources/interopdoc.wsdl
diff --git a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/resources/sequences.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/resources/sequences.xsd
index a565f3fa65..a565f3fa65 100644
--- a/branches/sca-java-1.2.1/tools/java2wsdl/src/test/resources/sequences.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/java2wsdl/src/test/resources/sequences.xsd
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-ant-generator/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-ant-generator/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-ant-generator/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-ant-generator/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-ant-generator/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-ant-generator/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-ant-generator/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-ant-generator/LICENSE
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-ant-generator/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-ant-generator/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-ant-generator/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-ant-generator/NOTICE
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-ant-generator/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-ant-generator/pom.xml
index fcc7e23eec..fcc7e23eec 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-ant-generator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-ant-generator/pom.xml
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-incremental-build/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-incremental-build/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-incremental-build/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-incremental-build/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-incremental-build/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-incremental-build/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-incremental-build/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-incremental-build/LICENSE
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-incremental-build/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-incremental-build/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-incremental-build/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-incremental-build/NOTICE
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-incremental-build/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-incremental-build/pom.xml
index 99d0887595..99d0887595 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-incremental-build/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-incremental-build/pom.xml
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
index a1d16e6601..a1d16e6601 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-java2wsdl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-java2wsdl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-java2wsdl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-java2wsdl/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-java2wsdl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-java2wsdl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-java2wsdl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-java2wsdl/LICENSE
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-java2wsdl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-java2wsdl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-java2wsdl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-java2wsdl/NOTICE
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-java2wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-java2wsdl/pom.xml
index 5222cd2319..5222cd2319 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-java2wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-java2wsdl/pom.xml
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java
index c0a8163af8..c0a8163af8 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-web-junit/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-web-junit/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-web-junit/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-web-junit/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-web-junit/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-web-junit/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-web-junit/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-web-junit/LICENSE
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-web-junit/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-web-junit/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-web-junit/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-web-junit/NOTICE
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-web-junit/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-web-junit/pom.xml
index 012297c48c..012297c48c 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-web-junit/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-web-junit/pom.xml
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java b/sca-java-1.x/branches/sca-java-1.2.1/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-java-1.2.1/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java
index 45b275b0dd..45b275b0dd 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/LICENSE
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/NOTICE
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/pom.xml
index eadbc6391a..eadbc6391a 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/pom.xml
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java
index 2d08c31326..2d08c31326 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java
diff --git a/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java
index 3e6ebf0acc..3e6ebf0acc 100644
--- a/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java
diff --git a/branches/sca-java-1.2.1/tools/maven/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/pom.xml
index 757f34d177..757f34d177 100644
--- a/branches/sca-java-1.2.1/tools/maven/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/maven/pom.xml
diff --git a/branches/sca-java-1.2.1/tools/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tools/pom.xml
index 020cdabe9c..020cdabe9c 100644
--- a/branches/sca-java-1.2.1/tools/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/pom.xml
diff --git a/branches/sca-java-1.2.1/tools/registry-inspector/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/tools/registry-inspector/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/tools/registry-inspector/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/registry-inspector/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/tools/registry-inspector/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/tools/registry-inspector/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/tools/registry-inspector/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/registry-inspector/LICENSE
diff --git a/branches/sca-java-1.2.1/tools/registry-inspector/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/tools/registry-inspector/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/tools/registry-inspector/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/registry-inspector/NOTICE
diff --git a/branches/sca-java-1.2.1/tools/registry-inspector/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tools/registry-inspector/pom.xml
index 0615677ce3..0615677ce3 100644
--- a/branches/sca-java-1.2.1/tools/registry-inspector/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/registry-inspector/pom.xml
diff --git a/branches/sca-java-1.2.1/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/extension/RegistryInspectorModuleActivator.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/extension/RegistryInspectorModuleActivator.java
index 7607633b5f..7607633b5f 100644
--- a/branches/sca-java-1.2.1/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/extension/RegistryInspectorModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/extension/RegistryInspectorModuleActivator.java
diff --git a/branches/sca-java-1.2.1/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/inspector/ExtensionPointRegistryInspector.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/inspector/ExtensionPointRegistryInspector.java
index 6e478d72c7..6e478d72c7 100644
--- a/branches/sca-java-1.2.1/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/inspector/ExtensionPointRegistryInspector.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/inspector/ExtensionPointRegistryInspector.java
diff --git a/branches/sca-java-1.2.1/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/inspector/ExtensionPointRegistryInspectorImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/inspector/ExtensionPointRegistryInspectorImpl.java
index 5bef5f3047..5bef5f3047 100644
--- a/branches/sca-java-1.2.1/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/inspector/ExtensionPointRegistryInspectorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/registry-inspector/src/main/java/org/apache/tuscany/sca/tools/registryinspector/inspector/ExtensionPointRegistryInspectorImpl.java
diff --git a/branches/sca-java-1.2.1/tools/registry-inspector/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.2.1/tools/registry-inspector/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 0c286d5974..0c286d5974 100644
--- a/branches/sca-java-1.2.1/tools/registry-inspector/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/registry-inspector/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.2.1/tools/registry-inspector/src/main/resources/registryinspector.composite b/sca-java-1.x/branches/sca-java-1.2.1/tools/registry-inspector/src/main/resources/registryinspector.composite
index a4f0f9caef..a4f0f9caef 100644
--- a/branches/sca-java-1.2.1/tools/registry-inspector/src/main/resources/registryinspector.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/registry-inspector/src/main/resources/registryinspector.composite
diff --git a/branches/sca-java-1.2.1/tools/registry-inspector/src/test/java/org/apache/tuscany/sca/tools/registryinspector/RegistryInspectorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/registry-inspector/src/test/java/org/apache/tuscany/sca/tools/registryinspector/RegistryInspectorTestCase.java
index 9ad645e9a2..9ad645e9a2 100644
--- a/branches/sca-java-1.2.1/tools/registry-inspector/src/test/java/org/apache/tuscany/sca/tools/registryinspector/RegistryInspectorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/registry-inspector/src/test/java/org/apache/tuscany/sca/tools/registryinspector/RegistryInspectorTestCase.java
diff --git a/branches/sca-java-1.2.1/tools/wsdl2java/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.2.1/tools/wsdl2java/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/DISCLAIMER
diff --git a/branches/sca-java-1.2.1/tools/wsdl2java/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.2.1/tools/wsdl2java/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/LICENSE
diff --git a/branches/sca-java-1.2.1/tools/wsdl2java/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.2.1/tools/wsdl2java/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/NOTICE
diff --git a/branches/sca-java-1.2.1/tools/wsdl2java/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/pom.xml
index e4bbdcee9e..e4bbdcee9e 100644
--- a/branches/sca-java-1.2.1/tools/wsdl2java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/pom.xml
diff --git a/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
index a2220abe55..a2220abe55 100644
--- a/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
diff --git a/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
index 8e0c3683a3..8e0c3683a3 100644
--- a/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
diff --git a/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
index c48814c5ac..c48814c5ac 100644
--- a/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
diff --git a/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
index 4ab152fb90..4ab152fb90 100644
--- a/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
diff --git a/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
index 2d81ef12bf..2d81ef12bf 100644
--- a/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
diff --git a/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
index 1e790cdb3e..1e790cdb3e 100644
--- a/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
diff --git a/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
index d0b325982c..d0b325982c 100644
--- a/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
diff --git a/branches/sca-java-1.2.1/tools/wsdl2java/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/main/resources/META-INF/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/sca-java-1.2.1/tools/wsdl2java/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-1.2.1/tools/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
index 43005bcdbc..43005bcdbc 100644
--- a/branches/sca-java-1.2.1/tools/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
diff --git a/branches/sca-java-1.2.1/tools/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
index 92581d6ac2..92581d6ac2 100644
--- a/branches/sca-java-1.2.1/tools/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
diff --git a/branches/sca-java-1.2.1/tools/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
index e9e8aa882a..e9e8aa882a 100644
--- a/branches/sca-java-1.2.1/tools/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
diff --git a/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/AccountService.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/AccountService.wsdl
index 6c022aea4b..6c022aea4b 100644
--- a/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/AccountService.wsdl
diff --git a/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
index dda5a36085..dda5a36085 100644
--- a/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
diff --git a/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
index 09d1a58589..09d1a58589 100644
--- a/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
diff --git a/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/helloworld.wsdl
index 051f604bb2..051f604bb2 100644
--- a/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/helloworld.wsdl
diff --git a/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/interopdoc.wsdl b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/interopdoc.wsdl
index 820c26ca34..820c26ca34 100644
--- a/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/interopdoc.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/interopdoc.wsdl
diff --git a/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/sequences.xsd b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/sequences.xsd
index a565f3fa65..a565f3fa65 100644
--- a/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/sequences.xsd
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tools/wsdl2java/src/test/resources/sequences.xsd
diff --git a/branches/sca-java-1.2.1/tutorial/README b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/README
index f22aaa8108..f22aaa8108 100644
--- a/branches/sca-java-1.2.1/tutorial/README
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/README
diff --git a/branches/sca-java-1.2.1/tutorial/Tutorial.pdf b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/Tutorial.pdf
index e22f1b4c9d..e22f1b4c9d 100644
--- a/branches/sca-java-1.2.1/tutorial/Tutorial.pdf
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/Tutorial.pdf
diff --git a/branches/sca-java-1.2.1/tutorial/assets/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/META-INF/sca-contribution.xml
index 07e5cebab8..07e5cebab8 100644
--- a/branches/sca-java-1.2.1/tutorial/assets/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/tutorial/assets/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/pom.xml
index c8392fcf85..c8392fcf85 100644
--- a/branches/sca-java-1.2.1/tutorial/assets/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/pom.xml
diff --git a/branches/sca-java-1.2.1/tutorial/assets/services/Cart.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/Cart.java
index 916b8b46d2..916b8b46d2 100644
--- a/branches/sca-java-1.2.1/tutorial/assets/services/Cart.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/Cart.java
diff --git a/branches/sca-java-1.2.1/tutorial/assets/services/Catalog.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/Catalog.java
index 2c3b19f579..2c3b19f579 100644
--- a/branches/sca-java-1.2.1/tutorial/assets/services/Catalog.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/Catalog.java
diff --git a/branches/sca-java-1.2.1/tutorial/assets/services/CurrencyConverter.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/CurrencyConverter.java
index e104a0423a..e104a0423a 100644
--- a/branches/sca-java-1.2.1/tutorial/assets/services/CurrencyConverter.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/CurrencyConverter.java
diff --git a/branches/sca-java-1.2.1/tutorial/assets/services/CurrencyConverterImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/CurrencyConverterImpl.java
index c354aed447..c354aed447 100644
--- a/branches/sca-java-1.2.1/tutorial/assets/services/CurrencyConverterImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/CurrencyConverterImpl.java
diff --git a/branches/sca-java-1.2.1/tutorial/assets/services/FruitsCatalogImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/FruitsCatalogImpl.java
index 377b3d7e59..377b3d7e59 100644
--- a/branches/sca-java-1.2.1/tutorial/assets/services/FruitsCatalogImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/FruitsCatalogImpl.java
diff --git a/branches/sca-java-1.2.1/tutorial/assets/services/Item.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/Item.java
index 27abd4f016..27abd4f016 100644
--- a/branches/sca-java-1.2.1/tutorial/assets/services/Item.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/Item.java
diff --git a/branches/sca-java-1.2.1/tutorial/assets/services/ShoppingCartImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/ShoppingCartImpl.java
index d04fffe6f1..d04fffe6f1 100644
--- a/branches/sca-java-1.2.1/tutorial/assets/services/ShoppingCartImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/ShoppingCartImpl.java
diff --git a/branches/sca-java-1.2.1/tutorial/assets/services/Total.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/Total.java
index 8f464e526f..8f464e526f 100644
--- a/branches/sca-java-1.2.1/tutorial/assets/services/Total.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/Total.java
diff --git a/branches/sca-java-1.2.1/tutorial/assets/services/VegetablesCatalogImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/VegetablesCatalogImpl.java
index 8bfbc757db..8bfbc757db 100644
--- a/branches/sca-java-1.2.1/tutorial/assets/services/VegetablesCatalogImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/VegetablesCatalogImpl.java
diff --git a/branches/sca-java-1.2.1/tutorial/assets/services/db/ShoppingCartTableImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/db/ShoppingCartTableImpl.java
index 7b81d1d32f..7b81d1d32f 100644
--- a/branches/sca-java-1.2.1/tutorial/assets/services/db/ShoppingCartTableImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/db/ShoppingCartTableImpl.java
diff --git a/branches/sca-java-1.2.1/tutorial/assets/services/db/cart.sql b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/db/cart.sql
index 25f16cb36b..25f16cb36b 100644
--- a/branches/sca-java-1.2.1/tutorial/assets/services/db/cart.sql
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/db/cart.sql
diff --git a/branches/sca-java-1.2.1/tutorial/assets/services/merger/MergedCatalogImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/merger/MergedCatalogImpl.java
index c02b4e821e..c02b4e821e 100644
--- a/branches/sca-java-1.2.1/tutorial/assets/services/merger/MergedCatalogImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/services/merger/MergedCatalogImpl.java
diff --git a/branches/sca-java-1.2.1/tutorial/assets/tutorial.html b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/tutorial.html
index 0b5fcadc71..0b5fcadc71 100644
--- a/branches/sca-java-1.2.1/tutorial/assets/tutorial.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/tutorial.html
diff --git a/branches/sca-java-1.2.1/tutorial/assets/uiservices/store.html b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/uiservices/store.html
index 095570f949..095570f949 100644
--- a/branches/sca-java-1.2.1/tutorial/assets/uiservices/store.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/assets/uiservices/store.html
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-ejb/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/pom.xml
index f4f69c05c3..f4f69c05c3 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-ejb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/pom.xml
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/java/services/ejb/CatalogEJBHome.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/java/services/ejb/CatalogEJBHome.java
index c7ad31b682..c7ad31b682 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/java/services/ejb/CatalogEJBHome.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/java/services/ejb/CatalogEJBHome.java
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/java/services/ejb/CatalogEJBRemote.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/java/services/ejb/CatalogEJBRemote.java
index 7e79fc8b9d..7e79fc8b9d 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/java/services/ejb/CatalogEJBRemote.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/java/services/ejb/CatalogEJBRemote.java
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/java/services/ejb/Vegetable.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/java/services/ejb/Vegetable.java
index aab567a82e..aab567a82e 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/java/services/ejb/Vegetable.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/java/services/ejb/Vegetable.java
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBSessionBean.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBSessionBean.java
index 74b7e407ef..74b7e407ef 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBSessionBean.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBSessionBean.java
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml
index a0a7adf6fa..a0a7adf6fa 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
index bc1c3d5fce..bc1c3d5fce 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml
index 85e14d652c..85e14d652c 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType
index bc57b35e79..bc57b35e79 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/resources/catalog-ejb.composite b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/resources/catalog-ejb.composite
index d8ca5c87e4..d8ca5c87e4 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/resources/catalog-ejb.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/main/resources/catalog-ejb.composite
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java
index f9bd16f050..f9bd16f050 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java
index 6930093042..6930093042 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java
index 3482ebb9ec..3482ebb9ec 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java
index d848fbb280..d848fbb280 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java
index 6efc86b608..6efc86b608 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java
index bdc1a5cfd5..bdc1a5cfd5 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java
index a24108714e..a24108714e 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-mediation/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-mediation/META-INF/sca-contribution.xml
index 6a3673f04a..6a3673f04a 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-mediation/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-mediation/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-mediation/catalog-mediation.composite b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-mediation/catalog-mediation.composite
index d832e88acc..d832e88acc 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-mediation/catalog-mediation.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-mediation/catalog-mediation.composite
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-mediation/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-mediation/pom.xml
index 775d6e5b7f..775d6e5b7f 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-mediation/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-mediation/pom.xml
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java
index 6cfa54e9de..6cfa54e9de 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-webapp/catalog-web.composite b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-webapp/catalog-web.composite
index 3ba76da078..3ba76da078 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-webapp/catalog-web.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-webapp/catalog-web.composite
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-webapp/pom.xml
index 9ac1977700..9ac1977700 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-webapp/pom.xml
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-webapp/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-webapp/webapp/META-INF/sca-contribution.xml
index 71e7b8d511..71e7b8d511 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-webapp/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-webapp/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-webapp/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-webapp/webapp/WEB-INF/web.xml
index 1a4d84909c..1a4d84909c 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-webapp/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-webapp/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.2.1/tutorial/catalog-webapp/webapp/catalog.jsp b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-webapp/webapp/catalog.jsp
index fe51e854a5..fe51e854a5 100644
--- a/branches/sca-java-1.2.1/tutorial/catalog-webapp/webapp/catalog.jsp
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/catalog-webapp/webapp/catalog.jsp
diff --git a/branches/sca-java-1.2.1/tutorial/domain/cloud.composite b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/cloud.composite
index 993b634c9f..993b634c9f 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/cloud.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/cloud.composite
diff --git a/branches/sca-java-1.2.1/tutorial/domain/cloud/CatalogEJBNode.composite b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/cloud/CatalogEJBNode.composite
index b495b45ebd..b495b45ebd 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/cloud/CatalogEJBNode.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/cloud/CatalogEJBNode.composite
diff --git a/branches/sca-java-1.2.1/tutorial/domain/cloud/CatalogMediationNode.composite b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/cloud/CatalogMediationNode.composite
index bac96d9781..bac96d9781 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/cloud/CatalogMediationNode.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/cloud/CatalogMediationNode.composite
diff --git a/branches/sca-java-1.2.1/tutorial/domain/cloud/CatalogWebAppNode.composite b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/cloud/CatalogWebAppNode.composite
index f3ed2dfdd5..f3ed2dfdd5 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/cloud/CatalogWebAppNode.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/cloud/CatalogWebAppNode.composite
diff --git a/branches/sca-java-1.2.1/tutorial/domain/cloud/CatalogsNode.composite b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/cloud/CatalogsNode.composite
index 3a5ec770cb..3a5ec770cb 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/cloud/CatalogsNode.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/cloud/CatalogsNode.composite
diff --git a/branches/sca-java-1.2.1/tutorial/domain/cloud/CurrencyNode.composite b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/cloud/CurrencyNode.composite
index ed80268f22..ed80268f22 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/cloud/CurrencyNode.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/cloud/CurrencyNode.composite
diff --git a/branches/sca-java-1.2.1/tutorial/domain/cloud/StoreDBNode.composite b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/cloud/StoreDBNode.composite
index 9b09bd7344..9b09bd7344 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/cloud/StoreDBNode.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/cloud/StoreDBNode.composite
diff --git a/branches/sca-java-1.2.1/tutorial/domain/cloud/StoreEUNode.composite b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/cloud/StoreEUNode.composite
index 6a50de56d5..6a50de56d5 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/cloud/StoreEUNode.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/cloud/StoreEUNode.composite
diff --git a/branches/sca-java-1.2.1/tutorial/domain/cloud/StoreMergerNode.composite b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/cloud/StoreMergerNode.composite
index 0ce6e6a231..0ce6e6a231 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/cloud/StoreMergerNode.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/cloud/StoreMergerNode.composite
diff --git a/branches/sca-java-1.2.1/tutorial/domain/cloud/StoreNode.composite b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/cloud/StoreNode.composite
index e2b61a98e1..e2b61a98e1 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/cloud/StoreNode.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/cloud/StoreNode.composite
diff --git a/branches/sca-java-1.2.1/tutorial/domain/cloud/StoreSupplierNode.composite b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/cloud/StoreSupplierNode.composite
index df46bb8813..df46bb8813 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/cloud/StoreSupplierNode.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/cloud/StoreSupplierNode.composite
diff --git a/branches/sca-java-1.2.1/tutorial/domain/domain.composite b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/domain.composite
index ff4dde969c..ff4dde969c 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/domain.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/domain.composite
diff --git a/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchCatalogMediationNode.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchCatalogMediationNode.java
index 442b1b6a05..442b1b6a05 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchCatalogMediationNode.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchCatalogMediationNode.java
diff --git a/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchCatalogsNode.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchCatalogsNode.java
index 8a23433012..8a23433012 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchCatalogsNode.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchCatalogsNode.java
diff --git a/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchCurrencyNode.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchCurrencyNode.java
index fae521547d..fae521547d 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchCurrencyNode.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchCurrencyNode.java
diff --git a/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchStoreDBNode.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchStoreDBNode.java
index 480088b46a..480088b46a 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchStoreDBNode.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchStoreDBNode.java
diff --git a/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchStoreEUNode.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchStoreEUNode.java
index cdc7eb824b..cdc7eb824b 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchStoreEUNode.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchStoreEUNode.java
diff --git a/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchStoreMergerNode.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchStoreMergerNode.java
index 26452b231b..26452b231b 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchStoreMergerNode.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchStoreMergerNode.java
diff --git a/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchStoreNode.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchStoreNode.java
index d15ee0e9d2..d15ee0e9d2 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchStoreNode.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchStoreNode.java
diff --git a/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchStoreSupplierNode.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchStoreSupplierNode.java
index 4210108aa5..4210108aa5 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchStoreSupplierNode.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchStoreSupplierNode.java
diff --git a/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchTutorialDomainManager.java b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchTutorialDomainManager.java
index 7408e99c63..7408e99c63 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchTutorialDomainManager.java
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/launch/LaunchTutorialDomainManager.java
diff --git a/branches/sca-java-1.2.1/tutorial/domain/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/pom.xml
index 2265c33bd0..2265c33bd0 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/pom.xml
diff --git a/branches/sca-java-1.2.1/tutorial/domain/workspace.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/workspace.xml
index e405dea03a..e405dea03a 100644
--- a/branches/sca-java-1.2.1/tutorial/domain/workspace.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/domain/workspace.xml
diff --git a/branches/sca-java-1.2.1/tutorial/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/pom.xml
index d792623dcf..d792623dcf 100644
--- a/branches/sca-java-1.2.1/tutorial/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/pom.xml
diff --git a/branches/sca-java-1.2.1/tutorial/store-db/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-db/META-INF/sca-contribution.xml
index 7a5d5613be..7a5d5613be 100644
--- a/branches/sca-java-1.2.1/tutorial/store-db/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-db/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/tutorial/store-db/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-db/pom.xml
index dd4750c2d0..dd4750c2d0 100644
--- a/branches/sca-java-1.2.1/tutorial/store-db/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-db/pom.xml
diff --git a/branches/sca-java-1.2.1/tutorial/store-db/store-db.composite b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-db/store-db.composite
index 03094be5ad..03094be5ad 100644
--- a/branches/sca-java-1.2.1/tutorial/store-db/store-db.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-db/store-db.composite
diff --git a/branches/sca-java-1.2.1/tutorial/store-eu/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-eu/META-INF/sca-contribution.xml
index 552932b0e7..552932b0e7 100644
--- a/branches/sca-java-1.2.1/tutorial/store-eu/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-eu/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/tutorial/store-eu/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-eu/pom.xml
index 5cd956abf5..5cd956abf5 100644
--- a/branches/sca-java-1.2.1/tutorial/store-eu/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-eu/pom.xml
diff --git a/branches/sca-java-1.2.1/tutorial/store-eu/store-eu.composite b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-eu/store-eu.composite
index a0b8b50975..a0b8b50975 100644
--- a/branches/sca-java-1.2.1/tutorial/store-eu/store-eu.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-eu/store-eu.composite
diff --git a/branches/sca-java-1.2.1/tutorial/store-eu/uiservices/store-eu.html b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-eu/uiservices/store-eu.html
index ec72d9b2a7..ec72d9b2a7 100644
--- a/branches/sca-java-1.2.1/tutorial/store-eu/uiservices/store-eu.html
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-eu/uiservices/store-eu.html
diff --git a/branches/sca-java-1.2.1/tutorial/store-merger/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-merger/META-INF/sca-contribution.xml
index 700a84736c..700a84736c 100644
--- a/branches/sca-java-1.2.1/tutorial/store-merger/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-merger/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/tutorial/store-merger/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-merger/pom.xml
index 3931b754f4..3931b754f4 100644
--- a/branches/sca-java-1.2.1/tutorial/store-merger/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-merger/pom.xml
diff --git a/branches/sca-java-1.2.1/tutorial/store-merger/store-merger.composite b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-merger/store-merger.composite
index 76d77dc693..76d77dc693 100644
--- a/branches/sca-java-1.2.1/tutorial/store-merger/store-merger.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-merger/store-merger.composite
diff --git a/branches/sca-java-1.2.1/tutorial/store-supplier/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-supplier/META-INF/sca-contribution.xml
index a75087aca1..a75087aca1 100644
--- a/branches/sca-java-1.2.1/tutorial/store-supplier/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-supplier/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/tutorial/store-supplier/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-supplier/pom.xml
index b84dfb326a..b84dfb326a 100644
--- a/branches/sca-java-1.2.1/tutorial/store-supplier/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-supplier/pom.xml
diff --git a/branches/sca-java-1.2.1/tutorial/store-supplier/store-supplier.composite b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-supplier/store-supplier.composite
index eedae3bf7a..eedae3bf7a 100644
--- a/branches/sca-java-1.2.1/tutorial/store-supplier/store-supplier.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store-supplier/store-supplier.composite
diff --git a/branches/sca-java-1.2.1/tutorial/store/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store/META-INF/sca-contribution.xml
index 3ed6e4a4ef..3ed6e4a4ef 100644
--- a/branches/sca-java-1.2.1/tutorial/store/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/tutorial/store/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store/pom.xml
index 4f28a69873..4f28a69873 100644
--- a/branches/sca-java-1.2.1/tutorial/store/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store/pom.xml
diff --git a/branches/sca-java-1.2.1/tutorial/store/store.composite b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store/store.composite
index 95f61b57c0..95f61b57c0 100644
--- a/branches/sca-java-1.2.1/tutorial/store/store.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/store/store.composite
diff --git a/branches/sca-java-1.2.1/tutorial/web-services/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/web-services/META-INF/sca-contribution.xml
index 8f773f0f21..8f773f0f21 100644
--- a/branches/sca-java-1.2.1/tutorial/web-services/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/web-services/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.2.1/tutorial/web-services/catalogs.composite b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/web-services/catalogs.composite
index 154d475165..154d475165 100644
--- a/branches/sca-java-1.2.1/tutorial/web-services/catalogs.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/web-services/catalogs.composite
diff --git a/branches/sca-java-1.2.1/tutorial/web-services/currency.composite b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/web-services/currency.composite
index 7a3f70e299..7a3f70e299 100644
--- a/branches/sca-java-1.2.1/tutorial/web-services/currency.composite
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/web-services/currency.composite
diff --git a/branches/sca-java-1.2.1/tutorial/web-services/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/web-services/pom.xml
index 7bf9f671c7..7bf9f671c7 100644
--- a/branches/sca-java-1.2.1/tutorial/web-services/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.2.1/tutorial/web-services/pom.xml